| OLD | NEW |
| 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 if (!app_order_loader_) { | 382 if (!app_order_loader_) { |
| 383 app_order_loader_.reset( | 383 app_order_loader_.reset( |
| 384 new default_app_order::ExternalLoader(true /* async */)); | 384 new default_app_order::ExternalLoader(true /* async */)); |
| 385 } | 385 } |
| 386 | 386 |
| 387 media::SoundsManager::Create(); | 387 media::SoundsManager::Create(); |
| 388 | 388 |
| 389 // Initialize magnification manager before ash tray is created. And this must | 389 // Initialize magnification manager before ash tray is created. And this must |
| 390 // be placed after UserManager::SessionStarted(); | 390 // be placed after UserManager::SessionStarted(); |
| 391 AccessibilityManager::Initialize(); | 391 AccessibilityManager::Initialize(); |
| 392 #if !defined(USE_ATHENA) |
| 393 // TODO(oshima): MagnificationManager/WallpaperManager depends on ash. |
| 394 // crbug.com/408733, crbug.com/408734. |
| 392 MagnificationManager::Initialize(); | 395 MagnificationManager::Initialize(); |
| 393 | 396 |
| 394 // Add observers for WallpaperManager. This depends on PowerManagerClient, | 397 // Add observers for WallpaperManager. This depends on PowerManagerClient, |
| 395 // TimezoneSettings and CrosSettings. | 398 // TimezoneSettings and CrosSettings. |
| 396 WallpaperManager::Get()->AddObservers(); | 399 WallpaperManager::Get()->AddObservers(); |
| 400 #endif |
| 397 | 401 |
| 398 cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL, | 402 cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL, |
| 399 base::Bind(&ChromeOSVersionCallback), | 403 base::Bind(&ChromeOSVersionCallback), |
| 400 &tracker_); | 404 &tracker_); |
| 401 | 405 |
| 402 // Make sure that wallpaper boot transition and other delays in OOBE | 406 // Make sure that wallpaper boot transition and other delays in OOBE |
| 403 // are disabled for tests and kiosk app launch by default. | 407 // are disabled for tests and kiosk app launch by default. |
| 404 // Individual tests may enable them if they want. | 408 // Individual tests may enable them if they want. |
| 405 if (parsed_command_line().HasSwitch(::switches::kTestType) || | 409 if (parsed_command_line().HasSwitch(::switches::kTestType) || |
| 406 ShouldAutoLaunchKioskApp(parsed_command_line())) { | 410 ShouldAutoLaunchKioskApp(parsed_command_line())) { |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 chromeos::switches::kNaturalScrollDefault); | 613 chromeos::switches::kNaturalScrollDefault); |
| 610 system::InputDeviceSettings::Get()->SetTapToClick(true); | 614 system::InputDeviceSettings::Get()->SetTapToClick(true); |
| 611 } | 615 } |
| 612 | 616 |
| 613 ChromeBrowserMainPartsLinux::PreBrowserStart(); | 617 ChromeBrowserMainPartsLinux::PreBrowserStart(); |
| 614 } | 618 } |
| 615 | 619 |
| 616 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { | 620 void ChromeBrowserMainPartsChromeos::PostBrowserStart() { |
| 617 // These are dependent on the ash::Shell singleton already having been | 621 // These are dependent on the ash::Shell singleton already having been |
| 618 // initialized. | 622 // initialized. |
| 623 #if !defined(USE_ATHENA) |
| 624 // TODO(oshima): Remove ash dependency in PowerButtonObserver. |
| 625 // crbug.com/408832. |
| 619 power_button_observer_.reset(new PowerButtonObserver); | 626 power_button_observer_.reset(new PowerButtonObserver); |
| 627 #endif |
| 620 data_promo_notification_.reset(new DataPromoNotification()); | 628 data_promo_notification_.reset(new DataPromoNotification()); |
| 621 | 629 |
| 622 keyboard_event_rewriters_.reset(new EventRewriterController()); | 630 keyboard_event_rewriters_.reset(new EventRewriterController()); |
| 623 keyboard_event_rewriters_->AddEventRewriter( | 631 keyboard_event_rewriters_->AddEventRewriter( |
| 624 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. |
| 625 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( | 635 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( |
| 626 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); | 636 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); |
| 627 keyboard_event_rewriters_->Init(); | 637 keyboard_event_rewriters_->Init(); |
| 638 #endif |
| 628 | 639 |
| 629 ChromeBrowserMainPartsLinux::PostBrowserStart(); | 640 ChromeBrowserMainPartsLinux::PostBrowserStart(); |
| 630 } | 641 } |
| 631 | 642 |
| 632 // Shut down services before the browser process, etc are destroyed. | 643 // Shut down services before the browser process, etc are destroyed. |
| 633 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { | 644 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| 634 BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); | 645 BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); |
| 635 | 646 |
| 636 g_browser_process->platform_part()->oom_priority_manager()->Stop(); | 647 g_browser_process->platform_part()->oom_priority_manager()->Stop(); |
| 637 | 648 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 745 // Destroy DBus services immediately after threads are stopped. | 756 // Destroy DBus services immediately after threads are stopped. |
| 746 dbus_services_.reset(); | 757 dbus_services_.reset(); |
| 747 | 758 |
| 748 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 759 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 749 | 760 |
| 750 // Destroy DeviceSettingsService after g_browser_process. | 761 // Destroy DeviceSettingsService after g_browser_process. |
| 751 DeviceSettingsService::Shutdown(); | 762 DeviceSettingsService::Shutdown(); |
| 752 } | 763 } |
| 753 | 764 |
| 754 } // namespace chromeos | 765 } // namespace chromeos |
| OLD | NEW |