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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 52 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
53 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 53 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
54 #include "chrome/browser/chromeos/login/wizard_controller.h" | 54 #include "chrome/browser/chromeos/login/wizard_controller.h" |
55 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" | 55 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" |
56 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | 56 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" |
57 #include "chrome/browser/chromeos/options/cert_library.h" | 57 #include "chrome/browser/chromeos/options/cert_library.h" |
58 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h" | 58 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h" |
59 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 59 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
60 #include "chrome/browser/chromeos/policy/device_local_account.h" | 60 #include "chrome/browser/chromeos/policy/device_local_account.h" |
61 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" | 61 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" |
62 #include "chrome/browser/chromeos/power/lightbar.h" | |
62 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" | 63 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" |
63 #include "chrome/browser/chromeos/power/power_button_observer.h" | 64 #include "chrome/browser/chromeos/power/power_button_observer.h" |
64 #include "chrome/browser/chromeos/power/power_data_collector.h" | 65 #include "chrome/browser/chromeos/power/power_data_collector.h" |
65 #include "chrome/browser/chromeos/power/power_prefs.h" | 66 #include "chrome/browser/chromeos/power/power_prefs.h" |
66 #include "chrome/browser/chromeos/power/renderer_freezer.h" | 67 #include "chrome/browser/chromeos/power/renderer_freezer.h" |
67 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 68 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
68 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " | 69 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " |
69 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 70 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
70 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 71 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
71 #include "chrome/browser/chromeos/system/input_device_settings.h" | 72 #include "chrome/browser/chromeos/system/input_device_settings.h" |
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
555 extension_system_event_observer_.reset(new ExtensionSystemEventObserver()); | 556 extension_system_event_observer_.reset(new ExtensionSystemEventObserver()); |
556 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { | 557 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { |
557 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( | 558 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( |
558 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, | 559 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, |
559 "Retail mode"); | 560 "Retail mode"); |
560 } | 561 } |
561 | 562 |
562 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); | 563 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); |
563 | 564 |
564 renderer_freezer_.reset(new RendererFreezer()); | 565 renderer_freezer_.reset(new RendererFreezer()); |
566 lightbar_.reset(new LightBar()); | |
Daniel Erat
2014/09/12 19:53:03
can you instead check the lucid sleep flag here an
| |
565 | 567 |
566 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); | 568 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); |
567 | 569 |
568 // This observer cannot be created earlier because it requires the shell to be | 570 // This observer cannot be created earlier because it requires the shell to be |
569 // available. | 571 // available. |
570 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); | 572 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); |
571 | 573 |
572 ChromeBrowserMainPartsLinux::PostProfileInit(); | 574 ChromeBrowserMainPartsLinux::PostProfileInit(); |
573 } | 575 } |
574 | 576 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
672 // BrowserPolicyConnector (owned by g_browser_process). | 674 // BrowserPolicyConnector (owned by g_browser_process). |
673 DeviceSettingsService::Get()->UnsetSessionManager(); | 675 DeviceSettingsService::Get()->UnsetSessionManager(); |
674 | 676 |
675 // We should remove observers attached to D-Bus clients before | 677 // We should remove observers attached to D-Bus clients before |
676 // DBusThreadManager is shut down. | 678 // DBusThreadManager is shut down. |
677 extension_system_event_observer_.reset(); | 679 extension_system_event_observer_.reset(); |
678 retail_mode_power_save_blocker_.reset(); | 680 retail_mode_power_save_blocker_.reset(); |
679 peripheral_battery_observer_.reset(); | 681 peripheral_battery_observer_.reset(); |
680 power_prefs_.reset(); | 682 power_prefs_.reset(); |
681 renderer_freezer_.reset(); | 683 renderer_freezer_.reset(); |
684 lightbar_.reset(); | |
682 | 685 |
683 // Let the ScreenLocker unregister itself from SessionManagerClient before | 686 // Let the ScreenLocker unregister itself from SessionManagerClient before |
684 // DBusThreadManager is shut down. | 687 // DBusThreadManager is shut down. |
685 if (!KioskModeSettings::Get()->IsKioskModeEnabled()) | 688 if (!KioskModeSettings::Get()->IsKioskModeEnabled()) |
686 ScreenLocker::ShutDownClass(); | 689 ScreenLocker::ShutDownClass(); |
687 | 690 |
688 keyboard_event_rewriters_.reset(); | 691 keyboard_event_rewriters_.reset(); |
689 #if defined(USE_X11) | 692 #if defined(USE_X11) |
690 // The XInput2 event listener needs to be shut down earlier than when | 693 // The XInput2 event listener needs to be shut down earlier than when |
691 // Singletons are finally destroyed in AtExitManager. | 694 // Singletons are finally destroyed in AtExitManager. |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
759 // Destroy DBus services immediately after threads are stopped. | 762 // Destroy DBus services immediately after threads are stopped. |
760 dbus_services_.reset(); | 763 dbus_services_.reset(); |
761 | 764 |
762 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 765 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
763 | 766 |
764 // Destroy DeviceSettingsService after g_browser_process. | 767 // Destroy DeviceSettingsService after g_browser_process. |
765 DeviceSettingsService::Shutdown(); | 768 DeviceSettingsService::Shutdown(); |
766 } | 769 } |
767 | 770 |
768 } // namespace chromeos | 771 } // namespace chromeos |
OLD | NEW |