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

trunk/src/ash/ash_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/ash_switches.h"
 
 #include "base/command_line.h"
 
 namespace ash {
 namespace switches {
@@ skipping 238 matching lines @@
 }
 
 bool UseOverviewMode() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableOverviewMode);
 }
 
 bool UseDockedWindows() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableDockedWindows);
 }
 
+#if defined(OS_CHROMEOS)
 bool ShowAudioDeviceMenu() {
-#if defined(OS_CHROMEOS)
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableAudioDeviceMenu);
-#else
-  return false;
-#endif
 }
 
-#if defined(OS_CHROMEOS)
 bool UseUsbChargerNotification() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableUsbChargerNotification);
 }
 #endif
 
 }  // namespace switches
 }  // namespace ash