Chromium Code Reviews| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 53 #include "chrome/browser/chromeos/login/helper.h" | 53 #include "chrome/browser/chromeos/login/helper.h" |
| 54 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 54 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 55 #include "chrome/browser/chromeos/login/login_wizard.h" | 55 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 56 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 56 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 57 #include "chrome/browser/chromeos/login/startup_utils.h" | 57 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 58 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 58 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 59 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 59 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 60 #include "chrome/browser/chromeos/login/wizard_controller.h" | 60 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 61 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h" | 61 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h" |
| 62 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | 62 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" |
| 63 #include "chrome/browser/chromeos/net/network_throttling_observer.h" | |
| 63 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" | 64 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" |
| 64 #include "chrome/browser/chromeos/options/cert_library.h" | 65 #include "chrome/browser/chromeos/options/cert_library.h" |
| 65 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" | 66 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" |
| 66 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 67 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 67 #include "chrome/browser/chromeos/policy/device_local_account.h" | 68 #include "chrome/browser/chromeos/policy/device_local_account.h" |
| 68 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" | 69 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" |
| 69 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" | 70 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" |
| 70 #include "chrome/browser/chromeos/power/login_lock_state_notifier.h" | 71 #include "chrome/browser/chromeos/power/login_lock_state_notifier.h" |
| 71 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" | 72 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" |
| 72 #include "chrome/browser/chromeos/power/power_data_collector.h" | 73 #include "chrome/browser/chromeos/power/power_data_collector.h" |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 404 content::BrowserThread::GetTaskRunnerForThread( | 405 content::BrowserThread::GetTaskRunnerForThread( |
| 405 content::BrowserThread::FILE), | 406 content::BrowserThread::FILE), |
| 406 load_oem_statistics); | 407 load_oem_statistics); |
| 407 | 408 |
| 408 base::FilePath downloads_directory; | 409 base::FilePath downloads_directory; |
| 409 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 410 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
| 410 | 411 |
| 411 DeviceOAuth2TokenServiceFactory::Initialize(); | 412 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 412 | 413 |
| 413 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 414 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
| 415 network_throttling_observer_.reset(new NetworkThrottlingObserver()); | |
| 414 | 416 |
| 415 arc_service_launcher_.reset(new arc::ArcServiceLauncher()); | 417 arc_service_launcher_.reset(new arc::ArcServiceLauncher()); |
| 416 arc_service_launcher_->Initialize(); | 418 arc_service_launcher_->Initialize(); |
| 417 | 419 |
| 418 chromeos::ResourceReporter::GetInstance()->StartMonitoring( | 420 chromeos::ResourceReporter::GetInstance()->StartMonitoring( |
| 419 task_manager::TaskManagerInterface::GetTaskManager()); | 421 task_manager::TaskManagerInterface::GetTaskManager()); |
| 420 | 422 |
| 421 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 423 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 422 } | 424 } |
| 423 | 425 |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 791 // shutdown DeviceSettingsService yet, it might still be accessed by | 793 // shutdown DeviceSettingsService yet, it might still be accessed by |
| 792 // BrowserPolicyConnector (owned by g_browser_process). | 794 // BrowserPolicyConnector (owned by g_browser_process). |
| 793 DeviceSettingsService::Get()->UnsetSessionManager(); | 795 DeviceSettingsService::Get()->UnsetSessionManager(); |
| 794 | 796 |
| 795 // We should remove observers attached to D-Bus clients before | 797 // We should remove observers attached to D-Bus clients before |
| 796 // DBusThreadManager is shut down. | 798 // DBusThreadManager is shut down. |
| 797 extension_volume_observer_.reset(); | 799 extension_volume_observer_.reset(); |
| 798 peripheral_battery_observer_.reset(); | 800 peripheral_battery_observer_.reset(); |
| 799 power_prefs_.reset(); | 801 power_prefs_.reset(); |
| 800 renderer_freezer_.reset(); | 802 renderer_freezer_.reset(); |
| 801 wake_on_wifi_manager_.reset(); | 803 wake_on_wifi_manager_.reset(); |
|
stevenjb
2016/10/24 17:14:16
We should explicitly reset network_throttling_obse
kirtika1
2016/10/27 18:15:42
Done.
| |
| 802 ScreenLocker::ShutDownClass(); | 804 ScreenLocker::ShutDownClass(); |
| 803 keyboard_event_rewriters_.reset(); | 805 keyboard_event_rewriters_.reset(); |
| 804 low_disk_notification_.reset(); | 806 low_disk_notification_.reset(); |
| 805 #if defined(USE_X11) | 807 #if defined(USE_X11) |
| 806 if (!chrome::IsRunningInMash()) { | 808 if (!chrome::IsRunningInMash()) { |
| 807 // The XInput2 event listener needs to be shut down earlier than when | 809 // The XInput2 event listener needs to be shut down earlier than when |
| 808 // Singletons are finally destroyed in AtExitManager. | 810 // Singletons are finally destroyed in AtExitManager. |
| 809 XInputHierarchyChangedEventListener::GetInstance()->Stop(); | 811 XInputHierarchyChangedEventListener::GetInstance()->Stop(); |
| 810 | 812 |
| 811 DeviceUMA::GetInstance()->Stop(); | 813 DeviceUMA::GetInstance()->Stop(); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 886 // Destroy DBus services immediately after threads are stopped. | 888 // Destroy DBus services immediately after threads are stopped. |
| 887 dbus_services_.reset(); | 889 dbus_services_.reset(); |
| 888 | 890 |
| 889 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 891 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 890 | 892 |
| 891 // Destroy DeviceSettingsService after g_browser_process. | 893 // Destroy DeviceSettingsService after g_browser_process. |
| 892 DeviceSettingsService::Shutdown(); | 894 DeviceSettingsService::Shutdown(); |
| 893 } | 895 } |
| 894 | 896 |
| 895 } // namespace chromeos | 897 } // namespace chromeos |
| OLD | NEW |