Run athena on chrome

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index b9250c6500f61d8419585e42c90b4971769113a6..c578a0aac32972c8a6f2e34ed9305238750c2abc 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -388,11 +388,16 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
   // Initialize magnification manager before ash tray is created. And this must
   // be placed after UserManager::SessionStarted();
   AccessibilityManager::Initialize();
+#if !defined(USE_ATHENA)
+  // TODO(oshima): MagnificationManager/WallpaperManager depends on ash.
+  // crbug.com/408733, crbug.com/408734.
+

[Mr4D (OOO till 08-26), 2014/08/29 00:09:59]

Sorry for this stupid nit but this empty line can go.

[oshima, 2014/08/29 00:44:43]

Done.

   MagnificationManager::Initialize();
 
   // Add observers for WallpaperManager. This depends on PowerManagerClient,
   // TimezoneSettings and CrosSettings.
   WallpaperManager::Get()->AddObservers();
+#endif
 
   cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL,
                                   base::Bind(&ChromeOSVersionCallback),
@@ -615,15 +620,19 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
 void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
   // These are dependent on the ash::Shell singleton already having been
   // initialized.
+#if !defined(USE_ATHENA)

[Jun Mukai, 2014/08/28 22:50:45]

It's better to mark the crbug URL so that we can distinguish intentionally
introduced ones from the ones which will be fixed later.

[oshima, 2014/08/28 23:59:04]

Done.

   power_button_observer_.reset(new PowerButtonObserver);
+#endif
   data_promo_notification_.reset(new DataPromoNotification());
 
   keyboard_event_rewriters_.reset(new EventRewriterController());
   keyboard_event_rewriters_->AddEventRewriter(
       scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
+#if !defined(USE_ATHENA)

[Jun Mukai, 2014/08/28 22:50:45]

ditto

[oshima, 2014/08/28 23:59:04]

Done.

   keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>(
       new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller())));
   keyboard_event_rewriters_->Init();
+#endif
 
   ChromeBrowserMainPartsLinux::PostBrowserStart();
 }