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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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_bridge_service.h" | 113 #include "components/arc/arc_bridge_service.h" |
114 #include "components/arc/arc_service_manager.h" | 114 #include "components/arc/arc_service_manager.h" |
115 #include "components/arc/settings/arc_settings_bridge.h" | 115 #include "components/arc/settings/arc_settings_bridge.h" |
116 #include "components/arc/video/arc_video_service.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" |
123 #include "components/user_manager/user_manager.h" | 124 #include "components/user_manager/user_manager.h" |
124 #include "components/wallpaper/wallpaper_manager_base.h" | 125 #include "components/wallpaper/wallpaper_manager_base.h" |
126 #include "content/public/browser/arc_video_service.h" | |
125 #include "content/public/browser/browser_thread.h" | 127 #include "content/public/browser/browser_thread.h" |
126 #include "content/public/browser/notification_service.h" | 128 #include "content/public/browser/notification_service.h" |
127 #include "content/public/common/content_switches.h" | 129 #include "content/public/common/content_switches.h" |
128 #include "content/public/common/main_function_params.h" | 130 #include "content/public/common/main_function_params.h" |
129 #include "device/bluetooth/bluetooth_adapter_factory.h" | 131 #include "device/bluetooth/bluetooth_adapter_factory.h" |
130 #include "device/bluetooth/dbus/bluez_dbus_manager.h" | 132 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
131 #include "media/audio/sounds/sounds_manager.h" | 133 #include "media/audio/sounds/sounds_manager.h" |
132 #include "net/base/network_change_notifier.h" | 134 #include "net/base/network_change_notifier.h" |
133 #include "net/socket/ssl_server_socket.h" | 135 #include "net/socket/ssl_server_socket.h" |
134 #include "net/url_request/url_request.h" | 136 #include "net/url_request/url_request.h" |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
385 load_oem_statistics); | 387 load_oem_statistics); |
386 | 388 |
387 base::FilePath downloads_directory; | 389 base::FilePath downloads_directory; |
388 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 390 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
389 | 391 |
390 DeviceOAuth2TokenServiceFactory::Initialize(); | 392 DeviceOAuth2TokenServiceFactory::Initialize(); |
391 | 393 |
392 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 394 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
393 | 395 |
394 arc_service_manager_.reset(new arc::ArcServiceManager( | 396 arc_service_manager_.reset(new arc::ArcServiceManager( |
395 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()))); | 397 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()), |
398 make_scoped_ptr(content::CreateArcVideoService()))); | |
Pawel Osciak
2015/12/28 08:58:03
Could CreateArcVideoService return a scoper instea
kcwu
2015/12/28 09:31:04
Done.
| |
396 arc_service_manager_->arc_bridge_service()->DetectAvailability(); | 399 arc_service_manager_->arc_bridge_service()->DetectAvailability(); |
397 | 400 |
398 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); | 401 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); |
399 | 402 |
400 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 403 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
401 } | 404 } |
402 | 405 |
403 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 406 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
404 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 407 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
405 // -- immediately before Profile creation(). | 408 // -- 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. | 826 // Destroy DBus services immediately after threads are stopped. |
824 dbus_services_.reset(); | 827 dbus_services_.reset(); |
825 | 828 |
826 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 829 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
827 | 830 |
828 // Destroy DeviceSettingsService after g_browser_process. | 831 // Destroy DeviceSettingsService after g_browser_process. |
829 DeviceSettingsService::Shutdown(); | 832 DeviceSettingsService::Shutdown(); |
830 } | 833 } |
831 | 834 |
832 } // namespace chromeos | 835 } // namespace chromeos |
OLD | NEW |