Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / athena / chrome_browser_main_extra_parts_athena.cc

diff --git a/src/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc b/src/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
index 9f91af5..db068c1 100644 (file)
--- a/src/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
+++ b/src/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h"
 
 #include "athena/env/public/athena_env.h"
-#include "athena/extensions/public/extensions_delegate.h"
 #include "athena/main/public/athena_launcher.h"
 #include "base/command_line.h"
 #include "base/macros.h"
@@ -38,14 +37,14 @@ class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts,
 
  private:
   // Overridden from ChromeBrowserMainExtraParts:
-  virtual void PreProfileInit() OVERRIDE {
+  virtual void PreProfileInit() override {
     athena::StartAthenaEnv(content::BrowserThread::GetBlockingPool()->
         GetTaskRunnerWithShutdownBehavior(
             base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
 
     ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
   }
-  virtual void PostProfileInit() OVERRIDE {
+  virtual void PostProfileInit() override {
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisableZeroBrowsersOpenForTests)) {
       chrome::IncrementKeepAliveCount();
@@ -54,7 +53,6 @@ class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts,
         g_browser_process->profile_manager()->GetActiveUserProfile();
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
             chromeos::switches::kLoginManager)) {
-      athena::ExtensionsDelegate::CreateExtensionsDelegateForChrome(profile);
       athena::CreateVirtualKeyboardWithContext(profile);
       athena::StartAthenaSessionWithContext(profile);
     } else {
@@ -63,12 +61,12 @@ class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts,
       athena::CreateVirtualKeyboardWithContext(profile);
     }
   }
-  virtual void PostMainMessageLoopRun() OVERRIDE { athena::ShutdownAthena(); }
+  virtual void PostMainMessageLoopRun() override { athena::ShutdownAthena(); }
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     switch (type) {
       case chrome::NOTIFICATION_APP_TERMINATING:
         athena::AthenaEnv::Get()->OnTerminating();