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

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: clang fix. 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 aeb853b23f0a990cbe6ce02f6f4e933e3b61192e..1f395f1e5193121d993089db58f6d57638594959 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -273,6 +273,11 @@ void RunAutoLaunchKioskApp() {
EmitLoginPromptVisible();
}
+bool UseNewAudioHandler() {
+ return !CommandLine::ForCurrentProcess()->
+ HasSwitch(ash::switches::kAshDisableNewAudioHandler);
+}
+
} // namespace
namespace internal {
@@ -478,11 +483,9 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
if (CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kEnableChromeAudioSwitching))
CrasAudioSwitchHandler::Initialize();
-
- if (CommandLine::ForCurrentProcess()->
- HasSwitch(ash::switches::kAshEnableNewAudioHandler)) {
- CrasAudioHandler::Initialize(
- AudioPrefHandler::Create(g_browser_process->local_state()));
+ if (UseNewAudioHandler()) {
+ CrasAudioHandler::Initialize(
+ AudioPrefHandler::Create(g_browser_process->local_state()));
} else {
AudioHandler::Initialize(
AudioPrefHandler::Create(g_browser_process->local_state()));
@@ -794,8 +797,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();
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698