| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" | 73 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" |
| 74 #include "chrome/browser/chromeos/power/login_lock_state_notifier.h" | 74 #include "chrome/browser/chromeos/power/login_lock_state_notifier.h" |
| 75 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" | 75 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" |
| 76 #include "chrome/browser/chromeos/power/power_data_collector.h" | 76 #include "chrome/browser/chromeos/power/power_data_collector.h" |
| 77 #include "chrome/browser/chromeos/power/power_prefs.h" | 77 #include "chrome/browser/chromeos/power/power_prefs.h" |
| 78 #include "chrome/browser/chromeos/power/renderer_freezer.h" | 78 #include "chrome/browser/chromeos/power/renderer_freezer.h" |
| 79 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 79 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 80 #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h" | 80 #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h" |
| 81 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
" | 81 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
" |
| 82 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 82 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 83 #include "chrome/browser/chromeos/settings/shutdown_policy_forwarder.h" |
| 83 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 84 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 84 #include "chrome/browser/chromeos/system/input_device_settings.h" | 85 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 85 #include "chrome/browser/chromeos/ui/low_disk_notification.h" | 86 #include "chrome/browser/chromeos/ui/low_disk_notification.h" |
| 86 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" | 87 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" |
| 87 #include "chrome/browser/defaults.h" | 88 #include "chrome/browser/defaults.h" |
| 88 #include "chrome/browser/lifetime/application_lifetime.h" | 89 #include "chrome/browser/lifetime/application_lifetime.h" |
| 89 #include "chrome/browser/net/chrome_network_delegate.h" | 90 #include "chrome/browser/net/chrome_network_delegate.h" |
| 90 #include "chrome/browser/profiles/profile.h" | 91 #include "chrome/browser/profiles/profile.h" |
| 91 #include "chrome/browser/profiles/profile_manager.h" | 92 #include "chrome/browser/profiles/profile_manager.h" |
| 92 #include "chrome/browser/task_manager/task_manager_interface.h" | 93 #include "chrome/browser/task_manager/task_manager_interface.h" |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 761 keyboard_event_rewriters_->AddEventRewriter( | 762 keyboard_event_rewriters_->AddEventRewriter( |
| 762 std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); | 763 std::unique_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); |
| 763 keyboard_event_rewriters_->AddEventRewriter( | 764 keyboard_event_rewriters_->AddEventRewriter( |
| 764 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); | 765 std::unique_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); |
| 765 keyboard_event_rewriters_->AddEventRewriter( | 766 keyboard_event_rewriters_->AddEventRewriter( |
| 766 std::unique_ptr<ui::EventRewriter>(new EventRewriter( | 767 std::unique_ptr<ui::EventRewriter>(new EventRewriter( |
| 767 ash::Shell::GetInstance()->sticky_keys_controller()))); | 768 ash::Shell::GetInstance()->sticky_keys_controller()))); |
| 768 keyboard_event_rewriters_->Init(); | 769 keyboard_event_rewriters_->Init(); |
| 769 } | 770 } |
| 770 | 771 |
| 772 // In classic ash must occur after ash::WmShell is initialized. Triggers a |
| 773 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy. |
| 774 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>(); |
| 775 |
| 771 ChromeBrowserMainPartsLinux::PostBrowserStart(); | 776 ChromeBrowserMainPartsLinux::PostBrowserStart(); |
| 772 } | 777 } |
| 773 | 778 |
| 774 // Shut down services before the browser process, etc are destroyed. | 779 // Shut down services before the browser process, etc are destroyed. |
| 775 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { | 780 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| 776 chromeos::ResourceReporter::GetInstance()->StopMonitoring(); | 781 chromeos::ResourceReporter::GetInstance()->StopMonitoring(); |
| 777 | 782 |
| 778 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); | 783 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); |
| 779 | 784 |
| 780 arc_service_launcher_->Shutdown(); | 785 arc_service_launcher_->Shutdown(); |
| 781 arc_kiosk_app_manager_.reset(); | 786 arc_kiosk_app_manager_.reset(); |
| 782 | 787 |
| 788 // Unregister CrosSettings observers before CrosSettings is destroyed. |
| 789 shutdown_policy_forwarder_.reset(); |
| 790 |
| 783 // Destroy the application name notifier for Kiosk mode. | 791 // Destroy the application name notifier for Kiosk mode. |
| 784 KioskModeIdleAppNameNotification::Shutdown(); | 792 KioskModeIdleAppNameNotification::Shutdown(); |
| 785 | 793 |
| 786 // Shutdown the upgrade detector for Chrome OS. The upgrade detector | 794 // Shutdown the upgrade detector for Chrome OS. The upgrade detector |
| 787 // stops monitoring changes from the update engine. | 795 // stops monitoring changes from the update engine. |
| 788 if (UpgradeDetectorChromeos::GetInstance()) | 796 if (UpgradeDetectorChromeos::GetInstance()) |
| 789 UpgradeDetectorChromeos::GetInstance()->Shutdown(); | 797 UpgradeDetectorChromeos::GetInstance()->Shutdown(); |
| 790 | 798 |
| 791 // Shutdown the network change notifier for Chrome OS. The network | 799 // Shutdown the network change notifier for Chrome OS. The network |
| 792 // change notifier stops monitoring changes from the power manager and | 800 // change notifier stops monitoring changes from the power manager and |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 // Destroy DBus services immediately after threads are stopped. | 906 // Destroy DBus services immediately after threads are stopped. |
| 899 dbus_services_.reset(); | 907 dbus_services_.reset(); |
| 900 | 908 |
| 901 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 909 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 902 | 910 |
| 903 // Destroy DeviceSettingsService after g_browser_process. | 911 // Destroy DeviceSettingsService after g_browser_process. |
| 904 DeviceSettingsService::Shutdown(); | 912 DeviceSettingsService::Shutdown(); |
| 905 } | 913 } |
| 906 | 914 |
| 907 } // namespace chromeos | 915 } // namespace chromeos |
| OLD | NEW |