| 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 } | 342 } |
| 343 | 343 |
| 344 // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun. | 344 // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun. |
| 345 // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads. | 345 // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads. |
| 346 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { | 346 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
| 347 // Set the crypto thread after the IO thread has been created/started. | 347 // Set the crypto thread after the IO thread has been created/started. |
| 348 TPMTokenLoader::Get()->SetCryptoTaskRunner( | 348 TPMTokenLoader::Get()->SetCryptoTaskRunner( |
| 349 content::BrowserThread::GetMessageLoopProxyForThread( | 349 content::BrowserThread::GetMessageLoopProxyForThread( |
| 350 content::BrowserThread::IO)); | 350 content::BrowserThread::IO)); |
| 351 | 351 |
| 352 CrasAudioHandler::Initialize(new AudioDevicesPrefHandlerImpl( | 352 CrasAudioHandler::Initialize( |
| 353 g_browser_process->local_state(), prefs::kAudioCaptureAllowed)); | 353 new AudioDevicesPrefHandlerImpl(g_browser_process->local_state())); |
| 354 | 354 |
| 355 // Start loading machine statistics here. StatisticsProvider::Shutdown() | 355 // Start loading machine statistics here. StatisticsProvider::Shutdown() |
| 356 // will ensure that loading is aborted on early exit. | 356 // will ensure that loading is aborted on early exit. |
| 357 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); | 357 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); |
| 358 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( | 358 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( |
| 359 content::BrowserThread::GetMessageLoopProxyForThread( | 359 content::BrowserThread::GetMessageLoopProxyForThread( |
| 360 content::BrowserThread::FILE), | 360 content::BrowserThread::FILE), |
| 361 load_oem_statistics); | 361 load_oem_statistics); |
| 362 | 362 |
| 363 base::FilePath downloads_directory; | 363 base::FilePath downloads_directory; |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 // Destroy DBus services immediately after threads are stopped. | 795 // Destroy DBus services immediately after threads are stopped. |
| 796 dbus_services_.reset(); | 796 dbus_services_.reset(); |
| 797 | 797 |
| 798 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 798 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 799 | 799 |
| 800 // Destroy DeviceSettingsService after g_browser_process. | 800 // Destroy DeviceSettingsService after g_browser_process. |
| 801 DeviceSettingsService::Shutdown(); | 801 DeviceSettingsService::Shutdown(); |
| 802 } | 802 } |
| 803 | 803 |
| 804 } // namespace chromeos | 804 } // namespace chromeos |
| OLD | NEW |