ash: Update icons for disconnected wifi, and muted audio in the tray.

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 "base/utf_string_conversions.h"
@@ skipping 42 matching lines @@
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     int level = static_cast<int>(delegate->GetVolumeLevel() * 100);
     int image_index = level / (100 / kVolumeLevel);
     if (level > 0 && image_index == 0)
       ++image_index;
     if (level == 100)
       image_index = kVolumeLevel - 1;
     else if (image_index == kVolumeLevel - 1)
       --image_index;
+    // Index 0 is reserved for mute.
+    if (delegate->IsAudioMuted())
+      image_index = 0;
+    else
+      ++image_index;
     if (image_index != image_index_) {
       SkIRect region = SkIRect::MakeXYWH(0, image_index * kVolumeImageHeight,
           kVolumeImageWidth, kVolumeImageHeight);
       SkBitmap bitmap;
       image_.ToSkBitmap()->extractSubset(&bitmap, region);
       SetImage(views::CustomButton::BS_NORMAL, &bitmap);
       image_index_ = image_index;
     }
     SchedulePaint();
   }
 
  private:
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size = views::ToggleImageButton::GetPreferredSize();
     size.set_height(kTrayPopupItemHeight);
     return size;
   }
 
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    views::ToggleImageButton::OnPaint(canvas);
-
-    ash::SystemTrayDelegate* delegate =
-        ash::Shell::GetInstance()->tray_delegate();
-    if (!delegate->IsAudioMuted())
-      return;
-
-    SkPaint paint;
-    paint.setColor(SkColorSetARGB(63, 0, 0, 0));
-    paint.setStrokeWidth(SkIntToScalar(3));
-    canvas->sk_canvas()->drawLine(SkIntToScalar(width()),
-        SkIntToScalar(10), SkIntToScalar(0), SkIntToScalar(height() - 10),
-        paint);
-  }
-
   gfx::Image image_;
   int image_index_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeButton);
 };
 
 class VolumeView : public views::View,
                    public views::ButtonListener,
                    public views::SliderListener {
  public:
@@ skipping 13 matching lines @@
             IDS_ASH_STATUS_TRAY_VOLUME));
     AddChildView(slider_);
   }
 
   virtual ~VolumeView() {}
 
   void SetVolumeLevel(float percent) {
     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 a repaint. So explicitly trigger a repaint.
-    icon_->SchedulePaint();
+    // trigger an update. So explicitly trigger an update.
+    icon_->Update();
   }
 
  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.
@@ skipping 64 matching lines @@
   if (volume_view_.get()) {
     volume_view_->SetVolumeLevel(percent);
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
     return;
   }
   PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
 }
 
 }  // namespace internal
 }  // namespace ash