Revert 251959 "Refactor the TrayAudio code so that it can be use..."

trunk/src/ash/ash_switches.cc

Index: trunk/src/ash/ash_switches.cc
===================================================================
--- trunk/src/ash/ash_switches.cc	(revision 252004)
+++ trunk/src/ash/ash_switches.cc	(working copy)
@@ -256,16 +256,12 @@
   return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableDockedWindows);
 }
 
-bool ShowAudioDeviceMenu() {
 #if defined(OS_CHROMEOS)
+bool ShowAudioDeviceMenu() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableAudioDeviceMenu);
-#else
-  return false;
-#endif
 }
 
-#if defined(OS_CHROMEOS)
 bool UseUsbChargerNotification() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableUsbChargerNotification);