Implement new volume mute button.

ash/system/tray/tray_views.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
 #define ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
 
 #include "ash/ash_export.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/size.h"
+#include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/slider.h"
 #include "ui/views/view.h"
 
 typedef unsigned int SkColor;
 
 namespace gfx {
@@ skipping 199 matching lines @@
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from views::CustomButton.
   virtual void StateChanged() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(TrayPopupHeaderButton);
 };
 
+// A button with a bar image and title text below the bar image. These buttons
+// will be used in audio and brightness control UI, which can be toggled with
+// on/off states.
+class TrayBarButtonWithTitle : public views::CustomButton {
+ public:
+  explicit TrayBarButtonWithTitle(views::ButtonListener* listener,

[sadrul, 2012/07/23 21:02:30]

explicit not needed

[jennyz, 2012/07/23 21:22:03]

Done.

+                                  int title_id,
+                                  int width);
+  virtual ~TrayBarButtonWithTitle();
+
+  // Overridden from views::View:
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+
+  void UpdateButton(bool control_on);
+
+ private:
+  class TrayBarButton;
+
+  TrayBarButton* image_;
+  views::Label* title_;
+  int width_;
+  int image_height_;
+
+  DISALLOW_COPY_AND_ASSIGN(TrayBarButtonWithTitle);
+};
+
 // The 'special' looking row in the uber-tray popups. This is usually the bottom
 // row in the popups, and has a fixed height.
 class SpecialPopupRow : public views::View {
  public:
   SpecialPopupRow();
   virtual ~SpecialPopupRow();
 
   void SetTextLabel(int string_id, ViewClickListener* listener);
   void SetContent(views::View* view);
 
@@ skipping 12 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SpecialPopupRow);
 };
 
 // Sets up a Label properly for the tray (sets color, font etc.).
 void SetupLabelForTray(views::Label* label);
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_VIEWS_H_