| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 76 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 77 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 77 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 78 #include "chrome/browser/chromeos/system/input_device_settings.h" | 78 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 79 #include "chrome/browser/chromeos/ui/low_disk_notification.h" | 79 #include "chrome/browser/chromeos/ui/low_disk_notification.h" |
| 80 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" | 80 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" |
| 81 #include "chrome/browser/defaults.h" | 81 #include "chrome/browser/defaults.h" |
| 82 #include "chrome/browser/lifetime/application_lifetime.h" | 82 #include "chrome/browser/lifetime/application_lifetime.h" |
| 83 #include "chrome/browser/net/chrome_network_delegate.h" | 83 #include "chrome/browser/net/chrome_network_delegate.h" |
| 84 #include "chrome/browser/profiles/profile.h" | 84 #include "chrome/browser/profiles/profile.h" |
| 85 #include "chrome/browser/profiles/profile_manager.h" | 85 #include "chrome/browser/profiles/profile_manager.h" |
| 86 #include "chrome/browser/task_manager/task_manager_interface.h" |
| 86 #include "chrome/browser/ui/ash/ash_util.h" | 87 #include "chrome/browser/ui/ash/ash_util.h" |
| 87 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h" | 88 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h" |
| 88 #include "chrome/common/channel_info.h" | 89 #include "chrome/common/channel_info.h" |
| 89 #include "chrome/common/chrome_constants.h" | 90 #include "chrome/common/chrome_constants.h" |
| 90 #include "chrome/common/chrome_paths.h" | 91 #include "chrome/common/chrome_paths.h" |
| 91 #include "chrome/common/chrome_switches.h" | 92 #include "chrome/common/chrome_switches.h" |
| 92 #include "chrome/common/logging_chrome.h" | 93 #include "chrome/common/logging_chrome.h" |
| 93 #include "chrome/common/pref_names.h" | 94 #include "chrome/common/pref_names.h" |
| 94 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 95 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
| 95 #include "chromeos/audio/cras_audio_handler.h" | 96 #include "chromeos/audio/cras_audio_handler.h" |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 base::FilePath downloads_directory; | 412 base::FilePath downloads_directory; |
| 412 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 413 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
| 413 | 414 |
| 414 DeviceOAuth2TokenServiceFactory::Initialize(); | 415 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 415 | 416 |
| 416 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 417 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
| 417 | 418 |
| 418 arc_service_launcher_.reset(new arc::ArcServiceLauncher()); | 419 arc_service_launcher_.reset(new arc::ArcServiceLauncher()); |
| 419 arc_service_launcher_->Initialize(); | 420 arc_service_launcher_->Initialize(); |
| 420 | 421 |
| 421 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); | 422 chromeos::ResourceReporter::GetInstance()->StartMonitoring( |
| 423 task_manager::TaskManagerInterface::GetTaskManager()); |
| 422 | 424 |
| 423 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 425 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 424 } | 426 } |
| 425 | 427 |
| 426 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 428 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| 427 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 429 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 428 // -- immediately before Profile creation(). | 430 // -- immediately before Profile creation(). |
| 429 | 431 |
| 430 // Now that the file thread exists we can record our stats. | 432 // Now that the file thread exists we can record our stats. |
| 431 BootTimesRecorder::Get()->RecordChromeMainStats(); | 433 BootTimesRecorder::Get()->RecordChromeMainStats(); |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 883 // Destroy DBus services immediately after threads are stopped. | 885 // Destroy DBus services immediately after threads are stopped. |
| 884 dbus_services_.reset(); | 886 dbus_services_.reset(); |
| 885 | 887 |
| 886 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 888 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 887 | 889 |
| 888 // Destroy DeviceSettingsService after g_browser_process. | 890 // Destroy DeviceSettingsService after g_browser_process. |
| 889 DeviceSettingsService::Shutdown(); | 891 DeviceSettingsService::Shutdown(); |
| 890 } | 892 } |
| 891 | 893 |
| 892 } // namespace chromeos | 894 } // namespace chromeos |
| OLD | NEW |