| 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 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 ChromeBrowserMainPartsLinux::PostMainMessageLoopStart(); | 411 ChromeBrowserMainPartsLinux::PostMainMessageLoopStart(); |
| 412 } | 412 } |
| 413 | 413 |
| 414 // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun. | 414 // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun. |
| 415 // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads. | 415 // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads. |
| 416 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { | 416 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
| 417 // Set the crypto thread after the IO thread has been created/started. | 417 // Set the crypto thread after the IO thread has been created/started. |
| 418 TPMTokenLoader::Get()->SetCryptoTaskRunner( | 418 TPMTokenLoader::Get()->SetCryptoTaskRunner( |
| 419 content::BrowserThread::GetMessageLoopProxyForThread( | 419 content::BrowserThread::GetMessageLoopProxyForThread( |
| 420 content::BrowserThread::IO)); | 420 content::BrowserThread::IO)); |
| 421 CertLoader::Get()->SetCryptoTaskRunner( |
| 422 content::BrowserThread::GetMessageLoopProxyForThread( |
| 423 content::BrowserThread::IO)); |
| 421 | 424 |
| 422 CrasAudioHandler::Initialize( | 425 CrasAudioHandler::Initialize( |
| 423 AudioDevicesPrefHandler::Create(g_browser_process->local_state())); | 426 AudioDevicesPrefHandler::Create(g_browser_process->local_state())); |
| 424 | 427 |
| 425 // Start loading machine statistics here. StatisticsProvider::Shutdown() | 428 // Start loading machine statistics here. StatisticsProvider::Shutdown() |
| 426 // will ensure that loading is aborted on early exit. | 429 // will ensure that loading is aborted on early exit. |
| 427 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); | 430 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); |
| 428 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( | 431 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( |
| 429 content::BrowserThread::GetMessageLoopProxyForThread( | 432 content::BrowserThread::GetMessageLoopProxyForThread( |
| 430 content::BrowserThread::FILE), | 433 content::BrowserThread::FILE), |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 766 // Destroy DBus services immediately after threads are stopped. | 769 // Destroy DBus services immediately after threads are stopped. |
| 767 dbus_services_.reset(); | 770 dbus_services_.reset(); |
| 768 | 771 |
| 769 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 772 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 770 | 773 |
| 771 // Destroy DeviceSettingsService after g_browser_process. | 774 // Destroy DeviceSettingsService after g_browser_process. |
| 772 DeviceSettingsService::Shutdown(); | 775 DeviceSettingsService::Shutdown(); |
| 773 } | 776 } |
| 774 | 777 |
| 775 } // namespace chromeos | 778 } // namespace chromeos |
| OLD | NEW |