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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 14678004: cros: Enable new cras audio handler by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
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 404e4b2dd628fe24a6afb498c452cef4ab74b29e..b486fbdd28c6dd7fb0cde7475c219461fcd4f80e 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 {
@@ -787,8 +791,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();

Powered by Google App Engine
This is Rietveld 408576698