| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 #include "chromeos/login/user_names.h" | 109 #include "chromeos/login/user_names.h" |
| 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/video/arc_video_bridge.h" | |
| 120 #include "components/arc/video/video_host_delegate.h" | |
| 121 #include "components/browser_sync/common/browser_sync_switches.h" | 119 #include "components/browser_sync/common/browser_sync_switches.h" |
| 122 #include "components/device_event_log/device_event_log.h" | 120 #include "components/device_event_log/device_event_log.h" |
| 123 #include "components/metrics/metrics_service.h" | 121 #include "components/metrics/metrics_service.h" |
| 124 #include "components/ownership/owner_key_util.h" | 122 #include "components/ownership/owner_key_util.h" |
| 125 #include "components/session_manager/core/session_manager.h" | 123 #include "components/session_manager/core/session_manager.h" |
| 126 #include "components/signin/core/account_id/account_id.h" | 124 #include "components/signin/core/account_id/account_id.h" |
| 127 #include "components/user_manager/user.h" | 125 #include "components/user_manager/user.h" |
| 128 #include "components/user_manager/user_manager.h" | 126 #include "components/user_manager/user_manager.h" |
| 129 #include "components/wallpaper/wallpaper_manager_base.h" | 127 #include "components/wallpaper/wallpaper_manager_base.h" |
| 130 #include "content/public/browser/arc_video_host_delegate.h" | |
| 131 #include "content/public/browser/browser_thread.h" | 128 #include "content/public/browser/browser_thread.h" |
| 132 #include "content/public/browser/notification_service.h" | 129 #include "content/public/browser/notification_service.h" |
| 133 #include "content/public/common/content_switches.h" | 130 #include "content/public/common/content_switches.h" |
| 134 #include "content/public/common/main_function_params.h" | 131 #include "content/public/common/main_function_params.h" |
| 135 #include "device/bluetooth/bluetooth_adapter_factory.h" | 132 #include "device/bluetooth/bluetooth_adapter_factory.h" |
| 136 #include "device/bluetooth/dbus/bluez_dbus_manager.h" | 133 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
| 137 #include "media/audio/sounds/sounds_manager.h" | 134 #include "media/audio/sounds/sounds_manager.h" |
| 138 #include "net/base/network_change_notifier.h" | 135 #include "net/base/network_change_notifier.h" |
| 139 #include "net/socket/ssl_server_socket.h" | 136 #include "net/socket/ssl_server_socket.h" |
| 140 #include "net/url_request/url_request.h" | 137 #include "net/url_request/url_request.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 DeviceOAuth2TokenServiceFactory::Initialize(); | 393 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 397 | 394 |
| 398 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 395 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
| 399 | 396 |
| 400 arc_service_manager_.reset(new arc::ArcServiceManager()); | 397 arc_service_manager_.reset(new arc::ArcServiceManager()); |
| 401 arc_service_manager_->AddService(make_scoped_ptr( | 398 arc_service_manager_->AddService(make_scoped_ptr( |
| 402 new arc::ArcAuthService(arc_service_manager_->arc_bridge_service()))); | 399 new arc::ArcAuthService(arc_service_manager_->arc_bridge_service()))); |
| 403 arc_service_manager_->AddService( | 400 arc_service_manager_->AddService( |
| 404 make_scoped_ptr(new arc::ArcIntentHelperBridge( | 401 make_scoped_ptr(new arc::ArcIntentHelperBridge( |
| 405 arc_service_manager_->arc_bridge_service()))); | 402 arc_service_manager_->arc_bridge_service()))); |
| 406 arc_service_manager_->AddService(make_scoped_ptr( | |
| 407 new arc::ArcVideoBridge(arc_service_manager_->arc_bridge_service(), | |
| 408 content::CreateArcVideoHostDelegate()))); | |
| 409 arc_service_manager_->arc_bridge_service()->DetectAvailability(); | 403 arc_service_manager_->arc_bridge_service()->DetectAvailability(); |
| 410 | 404 |
| 411 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); | 405 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); |
| 412 | 406 |
| 413 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 407 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 414 } | 408 } |
| 415 | 409 |
| 416 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 410 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| 417 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 411 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 418 // -- immediately before Profile creation(). | 412 // -- immediately before Profile creation(). |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 836 // Destroy DBus services immediately after threads are stopped. | 830 // Destroy DBus services immediately after threads are stopped. |
| 837 dbus_services_.reset(); | 831 dbus_services_.reset(); |
| 838 | 832 |
| 839 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 833 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 840 | 834 |
| 841 // Destroy DeviceSettingsService after g_browser_process. | 835 // Destroy DeviceSettingsService after g_browser_process. |
| 842 DeviceSettingsService::Shutdown(); | 836 DeviceSettingsService::Shutdown(); |
| 843 } | 837 } |
| 844 | 838 |
| 845 } // namespace chromeos | 839 } // namespace chromeos |
| OLD | NEW |