| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 1ead091f1bea88bb3fe085bf316656d87ff0d900..c7a13962e63ca3205cb1650577b39d8fa9d0fe99 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -272,6 +272,11 @@ void RunAutoLaunchKioskApp() {
|
| EmitLoginPromptVisible();
|
| }
|
|
|
| +bool UseNewAudioHandler() {
|
| + return !CommandLine::ForCurrentProcess()->
|
| + HasSwitch(ash::switches::kAshDisableNewAudioHandler);
|
| +}
|
| +
|
| } // namespace
|
|
|
| namespace internal {
|
| @@ -472,8 +477,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
|
| // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun.
|
| // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads.
|
| void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
|
| - if (CommandLine::ForCurrentProcess()->
|
| - HasSwitch(ash::switches::kAshEnableNewAudioHandler)) {
|
| + if (UseNewAudioHandler()) {
|
| CrasAudioHandler::Initialize(
|
| AudioPrefHandler::Create(g_browser_process->local_state()));
|
| } else {
|
| @@ -796,8 +800,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| // even if Initialize() wasn't called.
|
| SystemKeyEventListener::Shutdown();
|
| imageburner::BurnManager::Shutdown();
|
| - if (CommandLine::ForCurrentProcess()->
|
| - HasSwitch(ash::switches::kAshEnableNewAudioHandler)) {
|
| + if (UseNewAudioHandler()) {
|
| CrasAudioHandler::Shutdown();
|
| } else {
|
| AudioHandler::Shutdown();
|
|
|