Add support for blue buttons.

ui/views/controls/button/label_button_border.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 "ui/views/controls/button/label_button_border.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/native_theme_delegate.h"
 
 namespace views {
 
 namespace {
 
 // The button image IDs and focused images IDs used in lieu of a focus border.
 const int kNormalImages[] = IMAGE_GRID(IDR_BUTTON_NORMAL);
 const int kHoveredImages[] = IMAGE_GRID(IDR_BUTTON_HOVER);
 const int kPressedImages[] = IMAGE_GRID(IDR_BUTTON_PRESSED);
 const int kFocusedNormalImages[] = IMAGE_GRID(IDR_BUTTON_FOCUSED_NORMAL);
 const int kFocusedHoveredImages[] = IMAGE_GRID(IDR_BUTTON_FOCUSED_HOVER);
 const int kFocusedPressedImages[] = IMAGE_GRID(IDR_BUTTON_FOCUSED_PRESSED);
 
+const int kBlueNormalImages[] = IMAGE_GRID(IDR_BLUE_BUTTON_NORMAL);
+const int kBlueHoveredImages[] = IMAGE_GRID(IDR_BLUE_BUTTON_HOVER);
+const int kBluePressedImages[] = IMAGE_GRID(IDR_BLUE_BUTTON_PRESSED);
+const int kBlueFocusedNormalImages[] = IMAGE_GRID(
+    IDR_BLUE_BUTTON_FOCUSED_NORMAL);
+const int kBlueFocusedHoveredImages[] = IMAGE_GRID(
+    IDR_BLUE_BUTTON_FOCUSED_HOVER);
+const int kBlueFocusedPressedImages[] = IMAGE_GRID(
+    IDR_BLUE_BUTTON_FOCUSED_PRESSED);
+
 // The text-button hot and pushed image IDs; normal is unadorned by default.
 const int kTextHoveredImages[] = IMAGE_GRID(IDR_TEXTBUTTON_HOVER);
 const int kTextPressedImages[] = IMAGE_GRID(IDR_TEXTBUTTON_PRESSED);
 
 Button::ButtonState GetButtonState(ui::NativeTheme::State state) {
   switch(state) {
     case ui::NativeTheme::kDisabled: return Button::STATE_DISABLED;
     case ui::NativeTheme::kHovered:  return Button::STATE_HOVERED;
     case ui::NativeTheme::kNormal:   return Button::STATE_NORMAL;
     case ui::NativeTheme::kPressed:  return Button::STATE_PRESSED;
@@ skipping 42 matching lines @@
                Painter::CreateImageGridPainter(kFocusedHoveredImages));
     SetPainter(true, Button::STATE_PRESSED,
                Painter::CreateImageGridPainter(kFocusedPressedImages));
     SetPainter(true, Button::STATE_DISABLED,
                Painter::CreateImageGridPainter(kNormalImages));
   } else if (style == Button::STYLE_TEXTBUTTON) {
     SetPainter(false, Button::STATE_HOVERED,
                Painter::CreateImageGridPainter(kTextHoveredImages));
     SetPainter(false, Button::STATE_PRESSED,
                Painter::CreateImageGridPainter(kTextPressedImages));
+  } else if (style == Button::STYLE_BLUE_BUTTON) {
+    SetPainter(false, Button::STATE_NORMAL,
+               Painter::CreateImageGridPainter(kBlueNormalImages));
+    SetPainter(false, Button::STATE_HOVERED,
+               Painter::CreateImageGridPainter(kBlueHoveredImages));
+    SetPainter(false, Button::STATE_PRESSED,
+               Painter::CreateImageGridPainter(kBluePressedImages));
+    SetPainter(false, Button::STATE_DISABLED,
+               Painter::CreateImageGridPainter(kBlueNormalImages));
+    SetPainter(true, Button::STATE_NORMAL,
+               Painter::CreateImageGridPainter(kBlueFocusedNormalImages));
+    SetPainter(true, Button::STATE_HOVERED,
+               Painter::CreateImageGridPainter(kBlueFocusedHoveredImages));
+    SetPainter(true, Button::STATE_PRESSED,
+               Painter::CreateImageGridPainter(kBlueFocusedPressedImages));
+    SetPainter(true, Button::STATE_DISABLED,
+               Painter::CreateImageGridPainter(kBlueNormalImages));
   }
 }
 
 LabelButtonBorder::~LabelButtonBorder() {}
 
 void LabelButtonBorder::Paint(const View& view, gfx::Canvas* canvas) {
   DCHECK(!strcmp(view.GetClassName(), LabelButton::kViewClassName));
   const NativeThemeDelegate* native_theme_delegate =
       static_cast<const LabelButton*>(&view);
   ui::NativeTheme::Part part = native_theme_delegate->GetThemePart();
   gfx::Rect rect(native_theme_delegate->GetThemePaintRect());
   ui::NativeTheme::ExtraParams extra;
   const ui::NativeTheme* theme = view.GetNativeTheme();
   const ui::Animation* animation = native_theme_delegate->GetThemeAnimation();
   ui::NativeTheme::State state = native_theme_delegate->GetThemeState(&extra);
 
-  if (animation && animation->is_animating()) {
+  // TODO(msw): re-enable animation is for blue buttons. It's disabled now due

[msw, 2013/05/18 20:07:24]

nit: capitalization and s/animation is/animations/

[benwells, 2013/05/24 07:44:22]

Done.

+  // to crbug.com/239121.
+  if (animation && animation->is_animating() &&
+      style() != Button::STYLE_BLUE_BUTTON) {
     // Composite the background and foreground painters during state animations.
     int alpha = animation->CurrentValueBetween(0, 0xff);
     state = native_theme_delegate->GetBackgroundThemeState(&extra);
     canvas->SaveLayerAlpha(static_cast<uint8>(0xff - alpha));
     PaintHelper(this, canvas, theme, part, state, rect, extra);
     canvas->Restore();
 
     state = native_theme_delegate->GetForegroundThemeState(&extra);
     canvas->SaveLayerAlpha(static_cast<uint8>(alpha));
     PaintHelper(this, canvas, theme, part, state, rect, extra);
     canvas->Restore();
   } else if (state == ui::NativeTheme::kDisabled &&
-             style() == Button::STYLE_BUTTON) {
+             (style() == Button::STYLE_BUTTON ||
+              style() == Button::STYLE_BLUE_BUTTON)) {
     canvas->SaveLayerAlpha(static_cast<uint8>(0xff / 2));
     PaintHelper(this, canvas, theme, part, state, rect, extra);
     canvas->Restore();
   } else {
     PaintHelper(this, canvas, theme, part, state, rect, extra);
   }
 
   // Draw the Views focus border for the native theme style.
   if (style() == Button::STYLE_NATIVE_TEXTBUTTON &&
       view.focus_border() && extra.button.is_focused)
     view.focus_border()->Paint(view, canvas);
 }
 
 gfx::Insets LabelButtonBorder::GetInsets() const {
   // Return the style-specific insets between button contents and edges.
-  if (style() == Button::STYLE_BUTTON)
+  if (style() == Button::STYLE_BUTTON || style() == Button::STYLE_BLUE_BUTTON)
     return gfx::Insets(9, 13, 9, 13);
   if (style() == Button::STYLE_TEXTBUTTON)
     return gfx::Insets(5, 6, 5, 6);
   if (style() == Button::STYLE_NATIVE_TEXTBUTTON)
     return gfx::Insets(5, 12, 5, 12);
   NOTREACHED();
   return gfx::Insets();
 }
 
 Painter* LabelButtonBorder::GetPainter(bool focused,
                                        Button::ButtonState state) {
   return painters_[focused ? 1 : 0][state].get();
 }
 
 void LabelButtonBorder::SetPainter(bool focused,
                                    Button::ButtonState state,
                                    Painter* painter) {
   painters_[focused ? 1 : 0][state].reset(painter);
 }
 
 }  // namespace views