| 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 <vector> | 10 #include <vector> |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 #include "chromeos/login_event_recorder.h" | 109 #include "chromeos/login_event_recorder.h" |
| 110 #include "chromeos/network/network_change_notifier_chromeos.h" | 110 #include "chromeos/network/network_change_notifier_chromeos.h" |
| 111 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 111 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
| 112 #include "chromeos/network/network_handler.h" | 112 #include "chromeos/network/network_handler.h" |
| 113 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" | 113 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" |
| 114 #include "chromeos/system/statistics_provider.h" | 114 #include "chromeos/system/statistics_provider.h" |
| 115 #include "chromeos/tpm/tpm_token_loader.h" | 115 #include "chromeos/tpm/tpm_token_loader.h" |
| 116 #include "components/arc/arc_bridge_service.h" | 116 #include "components/arc/arc_bridge_service.h" |
| 117 #include "components/arc/arc_service_manager.h" | 117 #include "components/arc/arc_service_manager.h" |
| 118 #include "components/arc/settings/arc_settings_bridge.h" | 118 #include "components/arc/settings/arc_settings_bridge.h" |
| 119 #include "components/arc/video/arc_video_service.h" |
| 119 #include "components/browser_sync/common/browser_sync_switches.h" | 120 #include "components/browser_sync/common/browser_sync_switches.h" |
| 120 #include "components/device_event_log/device_event_log.h" | 121 #include "components/device_event_log/device_event_log.h" |
| 121 #include "components/metrics/metrics_service.h" | 122 #include "components/metrics/metrics_service.h" |
| 122 #include "components/ownership/owner_key_util.h" | 123 #include "components/ownership/owner_key_util.h" |
| 123 #include "components/session_manager/core/session_manager.h" | 124 #include "components/session_manager/core/session_manager.h" |
| 124 #include "components/signin/core/account_id/account_id.h" | 125 #include "components/signin/core/account_id/account_id.h" |
| 125 #include "components/user_manager/user.h" | 126 #include "components/user_manager/user.h" |
| 126 #include "components/user_manager/user_manager.h" | 127 #include "components/user_manager/user_manager.h" |
| 127 #include "components/wallpaper/wallpaper_manager_base.h" | 128 #include "components/wallpaper/wallpaper_manager_base.h" |
| 129 #include "content/public/browser/arc_video_service.h" |
| 128 #include "content/public/browser/browser_thread.h" | 130 #include "content/public/browser/browser_thread.h" |
| 129 #include "content/public/browser/notification_service.h" | 131 #include "content/public/browser/notification_service.h" |
| 130 #include "content/public/common/content_switches.h" | 132 #include "content/public/common/content_switches.h" |
| 131 #include "content/public/common/main_function_params.h" | 133 #include "content/public/common/main_function_params.h" |
| 132 #include "device/bluetooth/bluetooth_adapter_factory.h" | 134 #include "device/bluetooth/bluetooth_adapter_factory.h" |
| 133 #include "device/bluetooth/dbus/bluez_dbus_manager.h" | 135 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
| 134 #include "media/audio/sounds/sounds_manager.h" | 136 #include "media/audio/sounds/sounds_manager.h" |
| 135 #include "net/base/network_change_notifier.h" | 137 #include "net/base/network_change_notifier.h" |
| 136 #include "net/socket/ssl_server_socket.h" | 138 #include "net/socket/ssl_server_socket.h" |
| 137 #include "net/url_request/url_request.h" | 139 #include "net/url_request/url_request.h" |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 load_oem_statistics); | 390 load_oem_statistics); |
| 389 | 391 |
| 390 base::FilePath downloads_directory; | 392 base::FilePath downloads_directory; |
| 391 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 393 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
| 392 | 394 |
| 393 DeviceOAuth2TokenServiceFactory::Initialize(); | 395 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 394 | 396 |
| 395 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 397 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
| 396 | 398 |
| 397 arc_service_manager_.reset(new arc::ArcServiceManager( | 399 arc_service_manager_.reset(new arc::ArcServiceManager( |
| 398 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()))); | 400 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()), |
| 401 content::CreateArcVideoService())); |
| 399 arc_service_manager_->arc_bridge_service()->DetectAvailability(); | 402 arc_service_manager_->arc_bridge_service()->DetectAvailability(); |
| 400 | 403 |
| 401 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); | 404 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); |
| 402 | 405 |
| 403 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 406 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 404 } | 407 } |
| 405 | 408 |
| 406 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 409 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| 407 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 410 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 408 // -- immediately before Profile creation(). | 411 // -- immediately before Profile creation(). |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 826 // Destroy DBus services immediately after threads are stopped. | 829 // Destroy DBus services immediately after threads are stopped. |
| 827 dbus_services_.reset(); | 830 dbus_services_.reset(); |
| 828 | 831 |
| 829 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 832 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 830 | 833 |
| 831 // Destroy DeviceSettingsService after g_browser_process. | 834 // Destroy DeviceSettingsService after g_browser_process. |
| 832 DeviceSettingsService::Shutdown(); | 835 DeviceSettingsService::Shutdown(); |
| 833 } | 836 } |
| 834 | 837 |
| 835 } // namespace chromeos | 838 } // namespace chromeos |
| OLD | NEW |