| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 #include "chromeos/disks/disk_mount_manager.h" | 103 #include "chromeos/disks/disk_mount_manager.h" |
| 104 #include "chromeos/login/login_state.h" | 104 #include "chromeos/login/login_state.h" |
| 105 #include "chromeos/login/user_names.h" | 105 #include "chromeos/login/user_names.h" |
| 106 #include "chromeos/login_event_recorder.h" | 106 #include "chromeos/login_event_recorder.h" |
| 107 #include "chromeos/network/network_change_notifier_chromeos.h" | 107 #include "chromeos/network/network_change_notifier_chromeos.h" |
| 108 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 108 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
| 109 #include "chromeos/network/network_handler.h" | 109 #include "chromeos/network/network_handler.h" |
| 110 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" | 110 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" |
| 111 #include "chromeos/system/statistics_provider.h" | 111 #include "chromeos/system/statistics_provider.h" |
| 112 #include "chromeos/tpm/tpm_token_loader.h" | 112 #include "chromeos/tpm/tpm_token_loader.h" |
| 113 #include "components/arc/arc_auth_service.h" |
| 113 #include "components/arc/arc_bridge_service.h" | 114 #include "components/arc/arc_bridge_service.h" |
| 114 #include "components/arc/arc_service_manager.h" | 115 #include "components/arc/arc_service_manager.h" |
| 115 #include "components/arc/settings/arc_settings_bridge.h" | 116 #include "components/arc/settings/arc_settings_bridge.h" |
| 116 #include "components/browser_sync/common/browser_sync_switches.h" | 117 #include "components/browser_sync/common/browser_sync_switches.h" |
| 117 #include "components/device_event_log/device_event_log.h" | 118 #include "components/device_event_log/device_event_log.h" |
| 118 #include "components/metrics/metrics_service.h" | 119 #include "components/metrics/metrics_service.h" |
| 119 #include "components/ownership/owner_key_util.h" | 120 #include "components/ownership/owner_key_util.h" |
| 120 #include "components/session_manager/core/session_manager.h" | 121 #include "components/session_manager/core/session_manager.h" |
| 121 #include "components/signin/core/account_id/account_id.h" | 122 #include "components/signin/core/account_id/account_id.h" |
| 122 #include "components/user_manager/user.h" | 123 #include "components/user_manager/user.h" |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 load_oem_statistics); | 386 load_oem_statistics); |
| 386 | 387 |
| 387 base::FilePath downloads_directory; | 388 base::FilePath downloads_directory; |
| 388 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 389 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
| 389 | 390 |
| 390 DeviceOAuth2TokenServiceFactory::Initialize(); | 391 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 391 | 392 |
| 392 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 393 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
| 393 | 394 |
| 394 arc_service_manager_.reset(new arc::ArcServiceManager( | 395 arc_service_manager_.reset(new arc::ArcServiceManager( |
| 395 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()))); | 396 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()), |
| 397 make_scoped_ptr(new arc::ArcAuthService()))); |
| 396 arc_service_manager_->arc_bridge_service()->DetectAvailability(); | 398 arc_service_manager_->arc_bridge_service()->DetectAvailability(); |
| 397 | 399 |
| 398 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); | 400 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); |
| 399 | 401 |
| 400 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 402 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 401 } | 403 } |
| 402 | 404 |
| 403 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 405 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| 404 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 406 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 405 // -- immediately before Profile creation(). | 407 // -- immediately before Profile creation(). |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 823 // Destroy DBus services immediately after threads are stopped. | 825 // Destroy DBus services immediately after threads are stopped. |
| 824 dbus_services_.reset(); | 826 dbus_services_.reset(); |
| 825 | 827 |
| 826 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 828 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 827 | 829 |
| 828 // Destroy DeviceSettingsService after g_browser_process. | 830 // Destroy DeviceSettingsService after g_browser_process. |
| 829 DeviceSettingsService::Shutdown(); | 831 DeviceSettingsService::Shutdown(); |
| 830 } | 832 } |
| 831 | 833 |
| 832 } // namespace chromeos | 834 } // namespace chromeos |
| OLD | NEW |