Merge from Chromium at DEPS revision r200144
This commit was generated by merge_to_master.py.
Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 72cfd9d..fe707f2 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -4,6 +4,8 @@
#include "ash/ash_switches.h"
+#include "base/command_line.h"
+
namespace ash {
namespace switches {
@@ -148,5 +150,17 @@
// Enables a mode which enforces all browser & application windows to be created
// in maximized mode.
const char kForcedMaximizeMode[] = "forced-maximize-mode";
+
+bool UseNewAudioHandler() {
+ return !CommandLine::ForCurrentProcess()->
+ HasSwitch(ash::switches::kAshDisableNewAudioHandler);
+}
+
+bool ShowAudioDeviceMenu() {
+ return ash::switches::UseNewAudioHandler() &&
+ CommandLine::ForCurrentProcess()->
+ HasSwitch(ash::switches::kAshEnableAudioDeviceMenu);
+}
+
} // namespace switches
} // namespace ash