[reland] views: Move MenuButton from TextButton to LabelButton.

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

 // Copyright 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 "chrome/browser/ui/views/toolbar/browser_action_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_action.h"
@@ skipping 19 matching lines @@
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 using extensions::Extension;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView
 
-bool BrowserActionView::Delegate::NeedToShowMultipleIconStates() const {
-  return true;
-}
-
-bool BrowserActionView::Delegate::NeedToShowTooltip() const {
-  return true;
-}
-
 BrowserActionView::BrowserActionView(const Extension* extension,
                                      Browser* browser,
                                      BrowserActionView::Delegate* delegate)
     : browser_(browser),
       delegate_(delegate),
       button_(NULL),
       extension_(extension) {
   set_id(VIEW_ID_BROWSER_ACTION);
   button_ = new BrowserActionButton(extension_, browser_, delegate_);
   button_->set_drag_controller(delegate_);
@@ skipping 45 matching lines @@
       browser_action_(
           extensions::ExtensionActionManager::Get(browser->profile())->
           GetBrowserAction(*extension)),
       extension_(extension),
       icon_factory_(browser->profile(), extension, browser_action_, this),
       delegate_(delegate),
       context_menu_(NULL),
       called_registered_extension_command_(false),
       icon_observer_(NULL) {
   SetBorder(views::Border::NullBorder());
-  set_alignment(TextButton::ALIGN_CENTER);
+  SetHorizontalAlignment(gfx::ALIGN_CENTER);
   set_context_menu_controller(this);
 
   // No UpdateState() here because View hierarchy not setup yet. Our parent
   // should call UpdateState() after creation.
 
   content::NotificationSource notification_source =
       content::Source<Profile>(browser_->profile()->GetOriginalProfile());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
                  content::Source<ExtensionAction>(browser_action_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED,
@@ skipping 80 matching lines @@
   menu_runner_.reset();
   SetButtonNotPushed();
   context_menu_ = NULL;
 }
 
 void BrowserActionButton::UpdateState() {
   int tab_id = delegate_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
-  SetShowMultipleIconStates(delegate_->NeedToShowMultipleIconStates());
-
   if (!IsEnabled(tab_id)) {
     SetState(views::CustomButton::STATE_DISABLED);
   } else {
     SetState(menu_visible_ ?
              views::CustomButton::STATE_PRESSED :
              views::CustomButton::STATE_NORMAL);
   }
 
   gfx::ImageSkia icon = *icon_factory_.GetIcon(tab_id).ToImageSkia();
 
   if (!icon.isNull()) {
     if (!browser_action()->GetIsVisible(tab_id))
       icon = gfx::ImageSkiaOperations::CreateTransparentImage(icon, .25);
 
     ThemeService* theme =
         ThemeServiceFactory::GetForProfile(browser_->profile());
 
     gfx::ImageSkia bg = *theme->GetImageSkiaNamed(IDR_BROWSER_ACTION);
-    SetIcon(gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon));
+    SetImage(views::Button::STATE_NORMAL,
+             gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon));
 
     gfx::ImageSkia bg_h = *theme->GetImageSkiaNamed(IDR_BROWSER_ACTION_H);
-    SetHoverIcon(gfx::ImageSkiaOperations::CreateSuperimposedImage(bg_h, icon));
+    SetImage(views::Button::STATE_HOVERED,
+             gfx::ImageSkiaOperations::CreateSuperimposedImage(bg_h, icon));
 
     gfx::ImageSkia bg_p = *theme->GetImageSkiaNamed(IDR_BROWSER_ACTION_P);
-    SetPushedIcon(
-        gfx::ImageSkiaOperations::CreateSuperimposedImage(bg_p, icon));
+    SetImage(views::Button::STATE_PRESSED,
+             gfx::ImageSkiaOperations::CreateSuperimposedImage(bg_p, icon));
   }
 
   // If the browser action name is empty, show the extension name instead.
   std::string title = browser_action()->GetTitle(tab_id);
   base::string16 name =
       base::UTF8ToUTF16(title.empty() ? extension()->name() : title);
-  SetTooltipText(delegate_->NeedToShowTooltip() ? name : base::string16());
+  SetTooltipText(name);
   SetAccessibleName(name);
 
   parent()->SchedulePaint();
 }
 
 bool BrowserActionButton::IsPopup() {
   int tab_id = delegate_->GetCurrentTabId();
   return (tab_id < 0) ? false : browser_action_->HasPopup(tab_id);
 }
 
@@ skipping 54 matching lines @@
   // The return value of this method is returned via OnMousePressed.
   // We need to return false here since we're handing off focus to another
   // widget/view, and true will grab it right back and try to send events
   // to us.
   return false;
 }
 
 bool BrowserActionButton::OnMousePressed(const ui::MouseEvent& event) {
   if (!event.IsRightMouseButton()) {
     return IsPopup() ? MenuButton::OnMousePressed(event) :
-                       TextButton::OnMousePressed(event);
+                       LabelButton::OnMousePressed(event);
   }
 
   if (!views::View::ShouldShowContextMenuOnMousePress()) {
     // See comments in MenuButton::Activate() as to why this is needed.
     SetMouseHandler(NULL);
 
     ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
   }
   return false;
 }
 
 void BrowserActionButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (IsPopup() || context_menu_) {
     // TODO(erikkay) this never actually gets called (probably because of the
     // loss of focus).
     MenuButton::OnMouseReleased(event);
   } else {
-    TextButton::OnMouseReleased(event);
+    LabelButton::OnMouseReleased(event);
   }
 }
 
 void BrowserActionButton::OnMouseExited(const ui::MouseEvent& event) {
   if (IsPopup() || context_menu_)
     MenuButton::OnMouseExited(event);
   else
-    TextButton::OnMouseExited(event);
+    LabelButton::OnMouseExited(event);
 }
 
 bool BrowserActionButton::OnKeyReleased(const ui::KeyEvent& event) {
   return IsPopup() ? MenuButton::OnKeyReleased(event) :
-                     TextButton::OnKeyReleased(event);
+                     LabelButton::OnKeyReleased(event);
 }
 
 void BrowserActionButton::OnGestureEvent(ui::GestureEvent* event) {
   if (IsPopup())
     MenuButton::OnGestureEvent(event);
   else
-    TextButton::OnGestureEvent(event);
+    LabelButton::OnGestureEvent(event);
 }
 
 bool BrowserActionButton::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   delegate_->OnBrowserActionExecuted(this);
   return true;
 }
 
 void BrowserActionButton::SetButtonPushed() {
   SetState(views::CustomButton::STATE_PRESSED);
@@ skipping 12 matching lines @@
 gfx::ImageSkia BrowserActionButton::GetIconWithBadge() {
   int tab_id = delegate_->GetCurrentTabId();
   gfx::Size spacing(0, ToolbarView::kVertSpacing);
   gfx::ImageSkia icon = *icon_factory_.GetIcon(tab_id).ToImageSkia();
   if (!IsEnabled(tab_id))
     icon = gfx::ImageSkiaOperations::CreateTransparentImage(icon, .25);
   return browser_action_->GetIconWithBadge(icon, tab_id, spacing);
 }
 
 gfx::ImageSkia BrowserActionButton::GetIconForTest() {
-  return icon();
+  return GetImage(views::Button::STATE_NORMAL);
 }
 
 BrowserActionButton::~BrowserActionButton() {
 }
 
 void BrowserActionButton::MaybeRegisterExtensionCommand() {
   extensions::CommandService* command_service =
       extensions::CommandService::Get(browser_->profile());
   extensions::Command browser_action_command;
   if (command_service->GetBrowserActionCommand(
@@ skipping 18 matching lines @@
   extensions::Command browser_action_command;
   if (!only_if_active || !command_service->GetBrowserActionCommand(
           extension_->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &browser_action_command,
           NULL)) {
     GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
     keybinding_.reset(NULL);
   }
 }