diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 00:18:23 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 00:18:23 +0000 |
| commit | 934e3c950dad11ddc4198005ea2bc5ec6df3a5ec (patch) | |
| tree | 3464d1eb729f5f34e0c4533d2b17ec75357a6dbc /ash/ash_switches.cc | |
| parent | 6b471f2f47106e5bdcbc5fd4c93d16c2715ac9d7 (diff) | |
| download | chromium_src-934e3c950dad11ddc4198005ea2bc5ec6df3a5ec.zip chromium_src-934e3c950dad11ddc4198005ea2bc5ec6df3a5ec.tar.gz chromium_src-934e3c950dad11ddc4198005ea2bc5ec6df3a5ec.tar.bz2 | |
Remove old audio handler code.
Migrate the test cases to use CrasAudioHandler.
Re-enabled PolicyTest.DisableAudioOutput, and fixed an issue found with this test case.
BUG=233310
TBR=derat@chromium.org, rkc@chromium.org
Review URL: https://codereview.chromium.org/21380002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_switches.cc')
| -rw-r--r-- | ash/ash_switches.cc | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 20fe1a8..0c1ee11 100644 --- a/ash/ash_switches.cc +++ b/ash/ash_switches.cc @@ -63,11 +63,6 @@ const char kAshDisableAutoWindowPlacement[] = const char kAshDisableDisplayChangeLimiter[] = "ash-disable-display-change-limiter"; -#if defined(OS_CHROMEOS) -// Disable the new cras audio handler. -const char kAshDisableNewAudioHandler[] = "ash-disable-new-audio-handler"; -#endif - // If present new lock animations are enabled. const char kAshDisableNewLockAnimations[] = "ash-disable-new-lock-animations"; @@ -116,13 +111,6 @@ const char kAshEnableImmersiveFullscreen[] = "ash-enable-immersive-fullscreen"; const char kAshEnableMemoryMonitor[] = "ash-enable-memory-monitor"; #endif -#if defined(OS_CHROMEOS) -// TODO(jamescook): Remove this unused flag. It exists only to allow the -// "Enable new audio handler" about:flags item to have the tri-state -// default/enabled/disabled UI. -const char kAshEnableNewAudioHandler[] = "ash-enable-new-audio-handler"; -#endif - // Enables the Oak tree viewer. const char kAshEnableOak[] = "ash-enable-oak"; @@ -200,15 +188,9 @@ bool UseAlternateShelfLayout() { } #if defined(OS_CHROMEOS) -bool UseNewAudioHandler() { - return !CommandLine::ForCurrentProcess()-> - HasSwitch(ash::switches::kAshDisableNewAudioHandler); -} - bool ShowAudioDeviceMenu() { - return ash::switches::UseNewAudioHandler() && - !CommandLine::ForCurrentProcess()-> - HasSwitch(ash::switches::kAshDisableAudioDeviceMenu); + return !CommandLine::ForCurrentProcess()-> + HasSwitch(ash::switches::kAshDisableAudioDeviceMenu); } bool UseUsbChargerNotification() { |