Implement new volume mute button.

ash/system/audio/tray_volume.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/audio/tray_volume.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
@@ skipping 73 matching lines @@
     size.set_height(kTrayPopupItemHeight);
     return size;
   }
 
   gfx::Image image_;
   int image_index_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeButton);
 };
 
+class MuteButton : public ash::internal::TrayBarButtonWithTitle {
+ public:
+  explicit MuteButton(views::ButtonListener* listener)
+      : TrayBarButtonWithTitle(listener,
+            IDS_ASH_STATUS_TRAY_VOLUME_MUTE,
+            kTrayBarButtonWidth) {
+    Update();
+  }
+  virtual ~MuteButton() {}
+
+  void Update() {
+    ash::SystemTrayDelegate* delegate =
+        ash::Shell::GetInstance()->tray_delegate();
+    UpdateButton(delegate->IsAudioMuted());
+    SchedulePaint();
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(MuteButton);
+};
+
 class VolumeView : public views::View,
                    public views::ButtonListener,
                    public views::SliderListener {
  public:
   VolumeView() {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
           kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingBetweenItems));
 
     icon_ = new VolumeButton(this);
     AddChildView(icon_);
 
+    mute_ = new MuteButton(this);
+    AddChildView(mute_);
+
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     slider_ = new views::Slider(this, views::Slider::HORIZONTAL);
     slider_->set_focus_border_color(kFocusBorderColor);
     slider_->SetValue(
         delegate->IsAudioMuted() ? 0.0 : delegate->GetVolumeLevel());
     slider_->SetAccessibleName(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_ASH_STATUS_TRAY_VOLUME));
     AddChildView(slider_);
   }
 
   virtual ~VolumeView() {}
 
   void SetVolumeLevel(float percent) {
     // The change in volume will be reflected via accessibility system events,
     // so we prevent the UI event from being sent here.
     slider_->set_enable_accessibility_events(false);
     slider_->SetValue(percent);
     // 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.
     icon_->Update();
+    mute_->Update();
     slider_->set_enable_accessibility_events(true);
   }
 
  private:
   // Overridden from views::View.
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds) OVERRIDE {
     int w = width() - slider_->x();
     slider_->SetSize(gfx::Size(w, slider_->height()));
   }
 
   // Overridden from views::ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) OVERRIDE {
-    CHECK(sender == icon_);
+    CHECK(sender == icon_ || sender == mute_);
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     delegate->SetAudioMuted(!delegate->IsAudioMuted());
   }
 
   // Overridden from views:SliderListener.
   virtual void SliderValueChanged(views::Slider* sender,
                                   float value,
                                   float old_value,
                                   views::SliderChangeReason reason) OVERRIDE {
     if (reason == views::VALUE_CHANGED_BY_USER) {
       ash::SystemTrayDelegate* delegate =
           ash::Shell::GetInstance()->tray_delegate();
       delegate->SetVolumeLevel(value);
     }
     icon_->Update();
   }
 
   VolumeButton* icon_;
+  MuteButton* mute_;
   views::Slider* slider_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeView);
 };
 
 }  // namespace tray
 
 TrayVolume::TrayVolume()
     : TrayImageItem(IDR_AURA_UBER_TRAY_VOLUME_MUTE),
       volume_view_(NULL),
@@ skipping 40 matching lines @@
       percent = 0.0;
     volume_view_->SetVolumeLevel(percent);
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
     return;
   }
   PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
 }
 
 }  // namespace internal
 }  // namespace ash