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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 #include "chrome/browser/chromeos/language_preferences.h" | 51 #include "chrome/browser/chromeos/language_preferences.h" |
| 52 #include "chrome/browser/chromeos/login/helper.h" | 52 #include "chrome/browser/chromeos/login/helper.h" |
| 53 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 53 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 54 #include "chrome/browser/chromeos/login/login_wizard.h" | 54 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 55 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 55 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 56 #include "chrome/browser/chromeos/login/startup_utils.h" | 56 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 57 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 57 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 58 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 58 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 59 #include "chrome/browser/chromeos/login/wizard_controller.h" | 59 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 60 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | 60 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" |
| 61 #include "chrome/browser/chromeos/net/network_throttling_observer.h" | |
| 61 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" | 62 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" |
| 62 #include "chrome/browser/chromeos/options/cert_library.h" | 63 #include "chrome/browser/chromeos/options/cert_library.h" |
| 63 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" | 64 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" |
| 64 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 65 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 65 #include "chrome/browser/chromeos/policy/device_local_account.h" | 66 #include "chrome/browser/chromeos/policy/device_local_account.h" |
| 66 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" | 67 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" |
| 67 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" | 68 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" |
| 68 #include "chrome/browser/chromeos/power/login_lock_state_notifier.h" | 69 #include "chrome/browser/chromeos/power/login_lock_state_notifier.h" |
| 69 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" | 70 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" |
| 70 #include "chrome/browser/chromeos/power/power_data_collector.h" | 71 #include "chrome/browser/chromeos/power/power_data_collector.h" |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 403 content::BrowserThread::GetTaskRunnerForThread( | 404 content::BrowserThread::GetTaskRunnerForThread( |
| 404 content::BrowserThread::FILE), | 405 content::BrowserThread::FILE), |
| 405 load_oem_statistics); | 406 load_oem_statistics); |
| 406 | 407 |
| 407 base::FilePath downloads_directory; | 408 base::FilePath downloads_directory; |
| 408 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 409 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
| 409 | 410 |
| 410 DeviceOAuth2TokenServiceFactory::Initialize(); | 411 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 411 | 412 |
| 412 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 413 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
| 414 network_throttling_observer_.reset(new NetworkThrottlingObserver()); | |
|
Andrew T Wilson (Slow)
2016/10/21 13:27:30
Why are we constructing and not using Get()?
kirtika1
2016/10/23 00:04:49
The next patch-set removes Get(). I was emulating
| |
| 413 | 415 |
| 414 arc_service_launcher_.reset(new arc::ArcServiceLauncher()); | 416 arc_service_launcher_.reset(new arc::ArcServiceLauncher()); |
| 415 arc_service_launcher_->Initialize(); | 417 arc_service_launcher_->Initialize(); |
| 416 | 418 |
| 417 chromeos::ResourceReporter::GetInstance()->StartMonitoring( | 419 chromeos::ResourceReporter::GetInstance()->StartMonitoring( |
| 418 task_manager::TaskManagerInterface::GetTaskManager()); | 420 task_manager::TaskManagerInterface::GetTaskManager()); |
| 419 | 421 |
| 420 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 422 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 421 } | 423 } |
| 422 | 424 |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 882 // Destroy DBus services immediately after threads are stopped. | 884 // Destroy DBus services immediately after threads are stopped. |
| 883 dbus_services_.reset(); | 885 dbus_services_.reset(); |
| 884 | 886 |
| 885 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 887 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 886 | 888 |
| 887 // Destroy DeviceSettingsService after g_browser_process. | 889 // Destroy DeviceSettingsService after g_browser_process. |
| 888 DeviceSettingsService::Shutdown(); | 890 DeviceSettingsService::Shutdown(); |
| 889 } | 891 } |
| 890 | 892 |
| 891 } // namespace chromeos | 893 } // namespace chromeos |
| OLD | NEW |