Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 if (!app_order_loader_) { 381 if (!app_order_loader_) {
382 app_order_loader_.reset( 382 app_order_loader_.reset(
383 new default_app_order::ExternalLoader(true /* async */)); 383 new default_app_order::ExternalLoader(true /* async */));
384 } 384 }
385 385
386 media::SoundsManager::Create(); 386 media::SoundsManager::Create();
387 387
388 // Initialize magnification manager before ash tray is created. And this must 388 // Initialize magnification manager before ash tray is created. And this must
389 // be placed after UserManager::SessionStarted(); 389 // be placed after UserManager::SessionStarted();
390 AccessibilityManager::Initialize(); 390 AccessibilityManager::Initialize();
391 #if !defined(USE_ATHENA)
392 // TODO(oshima): MagnificationManager/WallpaperManager depends on ash.
393 // crbug.com/408733, crbug.com/408734.
394
391 MagnificationManager::Initialize(); 395 MagnificationManager::Initialize();
392 396
393 // Add observers for WallpaperManager. This depends on PowerManagerClient, 397 // Add observers for WallpaperManager. This depends on PowerManagerClient,
394 // TimezoneSettings and CrosSettings. 398 // TimezoneSettings and CrosSettings.
395 WallpaperManager::Get()->AddObservers(); 399 WallpaperManager::Get()->AddObservers();
400 #endif
396 401
397 cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL, 402 cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL,
398 base::Bind(&ChromeOSVersionCallback), 403 base::Bind(&ChromeOSVersionCallback),
399 &tracker_); 404 &tracker_);
400 405
401 // Make sure that wallpaper boot transition and other delays in OOBE 406 // Make sure that wallpaper boot transition and other delays in OOBE
402 // are disabled for tests and kiosk app launch by default. 407 // are disabled for tests and kiosk app launch by default.
403 // Individual tests may enable them if they want. 408 // Individual tests may enable them if they want.
404 if (parsed_command_line().HasSwitch(::switches::kTestType) || 409 if (parsed_command_line().HasSwitch(::switches::kTestType) ||
405 ShouldAutoLaunchKioskApp(parsed_command_line())) { 410 ShouldAutoLaunchKioskApp(parsed_command_line())) {
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 chromeos::switches::kNaturalScrollDefault); 613 chromeos::switches::kNaturalScrollDefault);
609 system::InputDeviceSettings::Get()->SetTapToClick(true); 614 system::InputDeviceSettings::Get()->SetTapToClick(true);
610 } 615 }
611 616
612 ChromeBrowserMainPartsLinux::PreBrowserStart(); 617 ChromeBrowserMainPartsLinux::PreBrowserStart();
613 } 618 }
614 619
615 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { 620 void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
616 // These are dependent on the ash::Shell singleton already having been 621 // These are dependent on the ash::Shell singleton already having been
617 // initialized. 622 // initialized.
623 #if !defined(USE_ATHENA)
624 // TODO(oshima): Remove ash dependency in PowerButtonObserver.
625 // crbug.com/408832.
618 power_button_observer_.reset(new PowerButtonObserver); 626 power_button_observer_.reset(new PowerButtonObserver);
627 #endif
619 data_promo_notification_.reset(new DataPromoNotification()); 628 data_promo_notification_.reset(new DataPromoNotification());
620 629
621 keyboard_event_rewriters_.reset(new EventRewriterController()); 630 keyboard_event_rewriters_.reset(new EventRewriterController());
622 keyboard_event_rewriters_->AddEventRewriter( 631 keyboard_event_rewriters_->AddEventRewriter(
623 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); 632 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
633 #if !defined(USE_ATHENA)
634 // TODO(oshima): Support accessibility on athena. crbug.com/408733.
624 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( 635 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>(
625 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); 636 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller())));
626 keyboard_event_rewriters_->Init(); 637 keyboard_event_rewriters_->Init();
638 #endif
627 639
628 ChromeBrowserMainPartsLinux::PostBrowserStart(); 640 ChromeBrowserMainPartsLinux::PostBrowserStart();
629 } 641 }
630 642
631 // Shut down services before the browser process, etc are destroyed. 643 // Shut down services before the browser process, etc are destroyed.
632 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { 644 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
633 BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); 645 BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
634 646
635 g_browser_process->platform_part()->oom_priority_manager()->Stop(); 647 g_browser_process->platform_part()->oom_priority_manager()->Stop();
636 648
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 // Destroy DBus services immediately after threads are stopped. 756 // Destroy DBus services immediately after threads are stopped.
745 dbus_services_.reset(); 757 dbus_services_.reset();
746 758
747 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 759 ChromeBrowserMainPartsLinux::PostDestroyThreads();
748 760
749 // Destroy DeviceSettingsService after g_browser_process. 761 // Destroy DeviceSettingsService after g_browser_process.
750 DeviceSettingsService::Shutdown(); 762 DeviceSettingsService::Shutdown();
751 } 763 }
752 764
753 } // namespace chromeos 765 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698