Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1186293003: Implement HasInputDevices in CrasAudioManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add SetHasInputDevice in FakeAudioManager Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 332
333 // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun. 333 // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun.
334 // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads. 334 // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads.
335 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { 335 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
336 // Set the crypto thread after the IO thread has been created/started. 336 // Set the crypto thread after the IO thread has been created/started.
337 TPMTokenLoader::Get()->SetCryptoTaskRunner( 337 TPMTokenLoader::Get()->SetCryptoTaskRunner(
338 content::BrowserThread::GetMessageLoopProxyForThread( 338 content::BrowserThread::GetMessageLoopProxyForThread(
339 content::BrowserThread::IO)); 339 content::BrowserThread::IO));
340 340
341 CrasAudioHandler::Initialize( 341 CrasAudioHandler::Initialize(
342 new AudioDevicesPrefHandlerImpl(g_browser_process->local_state())); 342 new AudioDevicesPrefHandlerImpl(g_browser_process->local_state()),
343 make_scoped_ptr(new CrasAudioHandler::AudioManagerWrapperImpl()));
343 344
344 // Start loading machine statistics here. StatisticsProvider::Shutdown() 345 // Start loading machine statistics here. StatisticsProvider::Shutdown()
345 // will ensure that loading is aborted on early exit. 346 // will ensure that loading is aborted on early exit.
346 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); 347 bool load_oem_statistics = !StartupUtils::IsOobeCompleted();
347 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( 348 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics(
348 content::BrowserThread::GetMessageLoopProxyForThread( 349 content::BrowserThread::GetMessageLoopProxyForThread(
349 content::BrowserThread::FILE), 350 content::BrowserThread::FILE),
350 load_oem_statistics); 351 load_oem_statistics);
351 352
352 base::FilePath downloads_directory; 353 base::FilePath downloads_directory;
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 // Destroy DBus services immediately after threads are stopped. 771 // Destroy DBus services immediately after threads are stopped.
771 dbus_services_.reset(); 772 dbus_services_.reset();
772 773
773 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 774 ChromeBrowserMainPartsLinux::PostDestroyThreads();
774 775
775 // Destroy DeviceSettingsService after g_browser_process. 776 // Destroy DeviceSettingsService after g_browser_process.
776 DeviceSettingsService::Shutdown(); 777 DeviceSettingsService::Shutdown();
777 } 778 }
778 779
779 } // namespace chromeos 780 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698