New statusbar images for ChromeOS

chrome/browser/chromeos/status/status_area_button.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/status/status_area_button.h"
 
 #include "gfx/canvas.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/theme_resources.h"
 #include "views/border.h"
@@ skipping 16 matching lines @@
 void StatusAreaButton::Paint(gfx::Canvas* canvas, bool for_drag) {
   if (state() == BS_PUSHED) {
     // Apply 10% white when pushed down.
     canvas->FillRectInt(SkColorSetARGB(0x19, 0xFF, 0xFF, 0xFF),
         0, 0, width(), height());
   }
 
   if (use_menu_button_paint_) {
     views::MenuButton::Paint(canvas, for_drag);
   } else {
-    if (state() == BS_PUSHED)
-      DrawPressed(canvas);
-
     DrawIcon(canvas);
     PaintFocusBorder(canvas);
   }
 }
 
 gfx::Size StatusAreaButton::GetPreferredSize() {
-  // icons are 24x24
-  static const int kIconWidth = 24;
-  static const int kIconHeight = 24;
   gfx::Insets insets = views::MenuButton::GetInsets();
-  gfx::Size prefsize(kIconWidth + insets.width(),
-                     kIconHeight + insets.height());
+  gfx::Size prefsize(icon_width() + insets.width(),
+                     icon_height() + insets.height());
 
   // Adjusts size when use menu button paint.
   if (use_menu_button_paint_) {
     gfx::Size menu_button_size = views::MenuButton::GetPreferredSize();
     prefsize.SetSize(
       std::max(prefsize.width(), menu_button_size.width()),
       std::max(prefsize.height(), menu_button_size.height())
     );
 
     // Shift 1-pixel down for odd number of pixels in vertical space.
@@ skipping 16 matching lines @@
   // We clear that max text size, so we can adjust the size to fit the text.
   ClearMaxTextSize();
   views::MenuButton::SetText(text);
 }
 
 void StatusAreaButton::DrawIcon(gfx::Canvas* canvas) {
   canvas->DrawBitmapInt(icon(), 0, 0);
 }
 
 }  // namespace chromeos