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