| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 #endif | 138 #endif |
| 139 | 139 |
| 140 // Exclude X11 dependents for ozone | 140 // Exclude X11 dependents for ozone |
| 141 #if defined(USE_X11) | 141 #if defined(USE_X11) |
| 142 #include "chrome/browser/chromeos/device_uma.h" | 142 #include "chrome/browser/chromeos/device_uma.h" |
| 143 #include "chrome/browser/chromeos/events/system_key_event_listener.h" | 143 #include "chrome/browser/chromeos/events/system_key_event_listener.h" |
| 144 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener
.h" | 144 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener
.h" |
| 145 #endif | 145 #endif |
| 146 | 146 |
| 147 #if defined(ENABLE_ARC) | 147 #if defined(ENABLE_ARC) |
| 148 #include "components/arc/arc_bridge_service.h" | 148 #include "components/arc/arc_bridge_service_impl.h" |
| 149 #endif | 149 #endif |
| 150 | 150 |
| 151 namespace chromeos { | 151 namespace chromeos { |
| 152 | 152 |
| 153 namespace { | 153 namespace { |
| 154 | 154 |
| 155 void ChromeOSVersionCallback(const std::string& version) { | 155 void ChromeOSVersionCallback(const std::string& version) { |
| 156 base::SetLinuxDistro(std::string("CrOS ") + version); | 156 base::SetLinuxDistro(std::string("CrOS ") + version); |
| 157 } | 157 } |
| 158 | 158 |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 load_oem_statistics); | 384 load_oem_statistics); |
| 385 | 385 |
| 386 base::FilePath downloads_directory; | 386 base::FilePath downloads_directory; |
| 387 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 387 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
| 388 | 388 |
| 389 DeviceOAuth2TokenServiceFactory::Initialize(); | 389 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 390 | 390 |
| 391 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 391 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
| 392 | 392 |
| 393 #if defined(ENABLE_ARC) | 393 #if defined(ENABLE_ARC) |
| 394 arc_bridge_service_.reset(new arc::ArcBridgeService( | 394 arc_bridge_service_.reset(new arc::ArcBridgeServiceImpl( |
| 395 content::BrowserThread::GetMessageLoopProxyForThread( | 395 content::BrowserThread::GetMessageLoopProxyForThread( |
| 396 content::BrowserThread::IO), | 396 content::BrowserThread::IO), |
| 397 content::BrowserThread::GetMessageLoopProxyForThread( | 397 content::BrowserThread::GetMessageLoopProxyForThread( |
| 398 content::BrowserThread::FILE))); | 398 content::BrowserThread::FILE))); |
| 399 arc_bridge_service_->DetectAvailability(); | 399 arc_bridge_service_->DetectAvailability(); |
| 400 #endif | 400 #endif |
| 401 | 401 |
| 402 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 402 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 403 } | 403 } |
| 404 | 404 |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 // Destroy DBus services immediately after threads are stopped. | 825 // Destroy DBus services immediately after threads are stopped. |
| 826 dbus_services_.reset(); | 826 dbus_services_.reset(); |
| 827 | 827 |
| 828 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 828 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 829 | 829 |
| 830 // Destroy DeviceSettingsService after g_browser_process. | 830 // Destroy DeviceSettingsService after g_browser_process. |
| 831 DeviceSettingsService::Shutdown(); | 831 DeviceSettingsService::Shutdown(); |
| 832 } | 832 } |
| 833 | 833 |
| 834 } // namespace chromeos | 834 } // namespace chromeos |
| OLD | NEW |