cros: Enable new cras audio handler by default

ash/system/chromeos/audio/tray_audio.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/system/chromeos/audio/tray_audio.h"
 
 #include <cmath>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 39 matching lines @@
 const int kExtraPaddingBetweenBarAndMore = 10;
 
 const int kNoAudioDeviceIcon = -1;
 
 // IDR_AURA_UBER_TRAY_VOLUME_LEVELS contains 5 images,
 // The one for mute is at the 0 index and the other
 // four are used for ascending volume levels.
 const int kVolumeLevels = 4;
 
 bool UseNewAudioHandler() {
-  return CommandLine::ForCurrentProcess()->
-      HasSwitch(ash::switches::kAshEnableNewAudioHandler);
+  return !CommandLine::ForCurrentProcess()->
+      HasSwitch(ash::switches::kAshDisableNewAudioHandler);
+}
+
+// Returns true if we should show the audio device switching UI.
+bool ShowAudioDeviceMenu() {
+  return UseNewAudioHandler() &&
+      CommandLine::ForCurrentProcess()->
+          HasSwitch(ash::switches::kAshEnableAudioDeviceMenu);
 }
 
 bool IsAudioMuted() {
   if(UseNewAudioHandler()) {
     return chromeos::CrasAudioHandler::Get()->IsOutputMuted();
   } else {
     return Shell::GetInstance()->system_tray_delegate()->
         GetVolumeControlDelegate()->IsAudioMuted();
   }
 }
@@ skipping 162 matching lines @@
     // It is possible that the volume was (un)muted, but the actual volume level
     // did not change. In that case, setting the value of the slider won't
     // trigger an update. So explicitly trigger an update.
     Update();
     slider_->set_enable_accessibility_events(true);
   }
 
  private:
   // Updates bar_, device_type_ icon, and more_ buttons.
   void UpdateDeviceTypeAndMore() {
-    if (!UseNewAudioHandler() || !is_default_view_) {
+    if (!ShowAudioDeviceMenu() || !is_default_view_) {
       more_->SetVisible(false);
       bar_->SetVisible(false);
       device_type_->SetVisible(false);
       return;
     }
 
     chromeos::CrasAudioHandler* audio_handler =
         chromeos::CrasAudioHandler::Get();
     bool show_more = audio_handler->has_alternative_output() ||
                      audio_handler->has_alternative_input();
@@ skipping 242 matching lines @@
 bool TrayAudio::GetInitialVisibility() {
   return IsAudioMuted();
 }
 
 views::View* TrayAudio::CreateDefaultView(user::LoginStatus status) {
   volume_view_ = new tray::VolumeView(this, true);
   return volume_view_;
 }
 
 views::View* TrayAudio::CreateDetailedView(user::LoginStatus status) {
-  if (!UseNewAudioHandler() || pop_up_volume_view_) {
+  if (!ShowAudioDeviceMenu() || pop_up_volume_view_) {
     volume_view_ = new tray::VolumeView(this, false);
     return volume_view_;
   } else {
     audio_detail_ = new tray::AudioDetailedView(this, status);
     return audio_detail_;
   }
 }
 
 void TrayAudio::DestroyDefaultView() {
   volume_view_ = NULL;
@@ skipping 85 matching lines @@
 
 void TrayAudio::Update() {
   if (audio_detail_)
     audio_detail_->Update();
   if (volume_view_)
     volume_view_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash