[Toolbar] Base toolbar button class with background images for button states

chrome/browser/ui/views/toolbar/toolbar_button.cc

Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
diff --git a/ui/views/controls/button/button_dropdown.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
similarity index 61%
copy from ui/views/controls/button/button_dropdown.cc
copy to chrome/browser/ui/views/toolbar/toolbar_button.cc
index 9a699ead48f4dbf09d6d8db53f4cff618b50c4c4..85b2037d6448aea63e1b9c2999eb11361b5dae89 100644
--- a/ui/views/controls/button/button_dropdown.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -1,66 +1,67 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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/button_dropdown.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
-#include "base/compiler_specific.h"
-#include "base/message_loop/message_loop.h"
-#include "base/strings/utf_string_conversions.h"
+#include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/widget.h"
 
-namespace views {
-
-// static
-const char ButtonDropDown::kViewClassName[] =
-    "ui/views/controls/button/ButtonDropDown";
-
 // How long to wait before showing the menu.
+// TODO(gbillock): replace with virtual method.
 const int kMenuTimerDelay = 500;
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// ButtonDropDown - constructors, destructors, initialization, cleanup
-//
-////////////////////////////////////////////////////////////////////////////////
-
-ButtonDropDown::ButtonDropDown(ButtonListener* listener, ui::MenuModel* model)
-    : ImageButton(listener),
+ToolbarButton::ToolbarButton(ui::MenuModel* model)
+    : views::LabelButton(this, string16()),
       model_(model),
       menu_showing_(false),
       y_position_on_lbuttondown_(0),
-      show_menu_factory_(this) {
-  set_context_menu_controller(this);
+      show_menu_factory_(this) {}
+
+ToolbarButton::~ToolbarButton() {}
+
+void ToolbarButton::Init() {
+  set_focusable(true);
+
+  // Provides the hover/pressed style used by buttons in the toolbar.
+  views::LabelButtonBorder* border =
+      new views::LabelButtonBorder(views::Button::STYLE_BUTTON);
+  const int kSiteChipHoverImages[] = IMAGE_GRID(IDR_TOOLBAR_BUTTON_HOVER);
+  border->SetPainter(false, views::Button::STATE_HOVERED,
+                     views::Painter::CreateImageGridPainter(
+                         kSiteChipHoverImages));
+  const int kSiteChipPressedImages[] = IMAGE_GRID(IDR_TOOLBAR_BUTTON_PRESSED);
+  border->SetPainter(false, views::Button::STATE_PRESSED,
+                     views::Painter::CreateImageGridPainter(
+                         kSiteChipPressedImages));
+  border->SetPainter(false, views::Button::STATE_NORMAL, NULL);
+  border->SetPainter(true, views::Button::STATE_NORMAL, NULL);
+  set_border(border);
 }
 
-ButtonDropDown::~ButtonDropDown() {
-}
+void ToolbarButton::ButtonPressed(views::Button* sender,
+                                  const ui::Event& event) {}
+
 
-void ButtonDropDown::ClearPendingMenu() {
+void ToolbarButton::ClearPendingMenu() {
   show_menu_factory_.InvalidateWeakPtrs();
 }
 
-bool ButtonDropDown::IsMenuShowing() const {
+bool ToolbarButton::IsMenuShowing() const {
   return menu_showing_;
 }
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// ButtonDropDown - Events
-//
-////////////////////////////////////////////////////////////////////////////////
-
-bool ButtonDropDown::OnMousePressed(const ui::MouseEvent& event) {
+bool ToolbarButton::OnMousePressed(const ui::MouseEvent& event) {
   if (enabled() && ShouldShowMenu() &&
       IsTriggerableEvent(event) && HitTestPoint(event.location())) {
     // Store the y pos of the mouse coordinates so we can use them later to
@@ -71,16 +72,16 @@ bool ButtonDropDown::OnMousePressed(const ui::MouseEvent& event) {
     // Schedule a task that will show the menu.
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
-        base::Bind(&ButtonDropDown::ShowDropDownMenu,
+        base::Bind(&ToolbarButton::ShowDropDownMenu,
                    show_menu_factory_.GetWeakPtr(),
                    ui::GetMenuSourceTypeForEvent(event)),
         base::TimeDelta::FromMilliseconds(kMenuTimerDelay));
   }
-  return ImageButton::OnMousePressed(event);
+  return LabelButton::OnMousePressed(event);
 }
 
-bool ButtonDropDown::OnMouseDragged(const ui::MouseEvent& event) {
-  bool result = ImageButton::OnMouseDragged(event);
+bool ToolbarButton::OnMouseDragged(const ui::MouseEvent& event) {
+  bool result = LabelButton::OnMouseDragged(event);
 
   if (show_menu_factory_.HasWeakPtrs()) {
     // If the mouse is dragged to a y position lower than where it was when
@@ -95,21 +96,17 @@ bool ButtonDropDown::OnMouseDragged(const ui::MouseEvent& event) {
   return result;
 }
 
-void ButtonDropDown::OnMouseReleased(const ui::MouseEvent& event) {
+void ToolbarButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (IsTriggerableEvent(event) ||
       (event.IsRightMouseButton() && !HitTestPoint(event.location()))) {
-    ImageButton::OnMouseReleased(event);
+    LabelButton::OnMouseReleased(event);
   }
 
   if (IsTriggerableEvent(event))
     show_menu_factory_.InvalidateWeakPtrs();
 }
 
-const char* ButtonDropDown::GetClassName() const {
-  return kViewClassName;
-}
-
-void ButtonDropDown::OnMouseExited(const ui::MouseEvent& event) {
+void ToolbarButton::OnMouseExited(const ui::MouseEvent& event) {
   // Starting a drag results in a MouseExited, we need to ignore it.
   // A right click release triggers an exit event. We want to
   // remain in a PUSHED state until the drop down menu closes.
@@ -117,26 +114,26 @@ void ButtonDropDown::OnMouseExited(const ui::MouseEvent& event) {
     SetState(STATE_NORMAL);
 }
 
-void ButtonDropDown::OnGestureEvent(ui::GestureEvent* event) {
+void ToolbarButton::OnGestureEvent(ui::GestureEvent* event) {
   if (menu_showing_) {
     // While dropdown menu is showing the button should not handle gestures.
     event->StopPropagation();
     return;
   }
 
-  ImageButton::OnGestureEvent(event);
+  LabelButton::OnGestureEvent(event);
 }
 
-void ButtonDropDown::GetAccessibleState(ui::AccessibleViewState* state) {
+void ToolbarButton::GetAccessibleState(ui::AccessibleViewState* state) {
   CustomButton::GetAccessibleState(state);
   state->role = ui::AccessibilityTypes::ROLE_BUTTONDROPDOWN;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
   state->state = ui::AccessibilityTypes::STATE_HASPOPUP;
 }
 
-void ButtonDropDown::ShowContextMenuForView(View* source,
-                                            const gfx::Point& point,
-                                            ui::MenuSourceType source_type) {
+void ToolbarButton::ShowContextMenuForView(View* source,
+                                           const gfx::Point& point,
+                                           ui::MenuSourceType source_type) {
   if (!enabled())
     return;
 
@@ -144,7 +141,7 @@ void ButtonDropDown::ShowContextMenuForView(View* source,
   ShowDropDownMenu(source_type);
 }
 
-bool ButtonDropDown::ShouldEnterPushedState(const ui::Event& event) {
+bool ToolbarButton::ShouldEnterPushedState(const ui::Event& event) {
   // Enter PUSHED state on press with Left or Right mouse button or on taps.
   // Remain in this state while the context menu is open.
   return event.type() == ui::ET_GESTURE_TAP ||
@@ -153,11 +150,11 @@ bool ButtonDropDown::ShouldEnterPushedState(const ui::Event& event) {
              ui::EF_RIGHT_MOUSE_BUTTON) & event.flags()) != 0);
 }
 
-bool ButtonDropDown::ShouldShowMenu() {
-  return true;
+bool ToolbarButton::ShouldShowMenu() {
+  return model_.get() != NULL;
 }
 
-void ButtonDropDown::ShowDropDownMenu(ui::MenuSourceType source_type) {
+void ToolbarButton::ShowDropDownMenu(ui::MenuSourceType source_type) {
   if (!ShouldShowMenu())
     return;
 
@@ -196,28 +193,28 @@ void ButtonDropDown::ShowDropDownMenu(ui::MenuSourceType source_type) {
 
   // Create and run menu.  Display an empty menu if model is NULL.
   if (model_.get()) {
-    MenuModelAdapter menu_delegate(model_.get());
+    views::MenuModelAdapter menu_delegate(model_.get());
     menu_delegate.set_triggerable_event_flags(triggerable_event_flags());
-    menu_runner_.reset(new MenuRunner(menu_delegate.CreateMenu()));
-    MenuRunner::RunResult result =
+    menu_runner_.reset(new views::MenuRunner(menu_delegate.CreateMenu()));
+    views::MenuRunner::RunResult result =
         menu_runner_->RunMenuAt(GetWidget(), NULL,
                                 gfx::Rect(menu_position, gfx::Size(0, 0)),
-                                MenuItemView::TOPLEFT,
+                                views::MenuItemView::TOPLEFT,
                                 source_type,
-                                MenuRunner::HAS_MNEMONICS);
-    if (result == MenuRunner::MENU_DELETED)
+                                views::MenuRunner::HAS_MNEMONICS);
+    if (result == views::MenuRunner::MENU_DELETED)
       return;
   } else {
-    MenuDelegate menu_delegate;
-    MenuItemView* menu = new MenuItemView(&menu_delegate);
-    menu_runner_.reset(new MenuRunner(menu));
-    MenuRunner::RunResult result =
+    views::MenuDelegate menu_delegate;
+    views::MenuItemView* menu = new views::MenuItemView(&menu_delegate);
+    menu_runner_.reset(new views::MenuRunner(menu));
+    views::MenuRunner::RunResult result =
         menu_runner_->RunMenuAt(GetWidget(), NULL,
                                 gfx::Rect(menu_position, gfx::Size(0, 0)),
-                                MenuItemView::TOPLEFT,
+                                views::MenuItemView::TOPLEFT,
                                 source_type,
-                                MenuRunner::HAS_MNEMONICS);
-    if (result == MenuRunner::MENU_DELETED)
+                                views::MenuRunner::HAS_MNEMONICS);
+    if (result == views::MenuRunner::MENU_DELETED)
       return;
   }
 
@@ -232,11 +229,3 @@ void ButtonDropDown::ShowDropDownMenu(ui::MenuSourceType source_type) {
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// ButtonDropDown - Accessibility
-//
-////////////////////////////////////////////////////////////////////////////////
-
-}  // namespace views