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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
381 content::BrowserThread::FILE), | 381 content::BrowserThread::FILE), |
382 load_oem_statistics); | 382 load_oem_statistics); |
383 | 383 |
384 base::FilePath downloads_directory; | 384 base::FilePath downloads_directory; |
385 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 385 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
386 | 386 |
387 DeviceOAuth2TokenServiceFactory::Initialize(); | 387 DeviceOAuth2TokenServiceFactory::Initialize(); |
388 | 388 |
389 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 389 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
390 | 390 |
391 arc_bridge_service_.reset(new arc::ArcBridgeService( | 391 arc_bridge_service_ = |
392 content::BrowserThread::GetMessageLoopProxyForThread( | 392 arc::ArcBridgeService::Create( |
393 content::BrowserThread::IO), | 393 content::BrowserThread::GetMessageLoopProxyForThread( |
394 content::BrowserThread::GetMessageLoopProxyForThread( | 394 content::BrowserThread::IO), |
395 content::BrowserThread::FILE))); | 395 content::BrowserThread::GetMessageLoopProxyForThread( |
| 396 content::BrowserThread::FILE)) |
| 397 .Pass(); |
396 arc_bridge_service_->DetectAvailability(); | 398 arc_bridge_service_->DetectAvailability(); |
397 | 399 |
398 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 400 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
399 } | 401 } |
400 | 402 |
401 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 403 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
402 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 404 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
403 // -- immediately before Profile creation(). | 405 // -- immediately before Profile creation(). |
404 | 406 |
405 // Now that the file thread exists we can record our stats. | 407 // Now that the file thread exists we can record our stats. |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
819 // Destroy DBus services immediately after threads are stopped. | 821 // Destroy DBus services immediately after threads are stopped. |
820 dbus_services_.reset(); | 822 dbus_services_.reset(); |
821 | 823 |
822 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 824 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
823 | 825 |
824 // Destroy DeviceSettingsService after g_browser_process. | 826 // Destroy DeviceSettingsService after g_browser_process. |
825 DeviceSettingsService::Shutdown(); | 827 DeviceSettingsService::Shutdown(); |
826 } | 828 } |
827 | 829 |
828 } // namespace chromeos | 830 } // namespace chromeos |
OLD | NEW |