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