Action box menu

chrome/browser/ui/views/browser_action_view.cc

Index: chrome/browser/ui/views/browser_action_view.cc
diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc
index cd1600b8e90bb61531468f9f45f34d9fa7f7d1a2..4e864499ba0db729e34e67381958b27ab811db1b 100644
--- a/chrome/browser/ui/views/browser_action_view.cc
+++ b/chrome/browser/ui/views/browser_action_view.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
+#include "chrome/browser/ui/views/browser_action_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
@@ -29,14 +30,15 @@ using extensions::Extension;
 // BrowserActionButton
 
 BrowserActionButton::BrowserActionButton(const Extension* extension,
-                                         BrowserActionsContainer* panel)
+                                         BrowserActionView::Delegate* delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           MenuButton(this, string16(), NULL, false)),
       browser_action_(extension->browser_action()),
       extension_(extension),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
-      panel_(panel),
-      context_menu_(NULL) {
+      delegate_(delegate),
+      context_menu_(NULL),
+      disable_tooltip_(false) {
   set_border(NULL);
   set_alignment(TextButton::ALIGN_CENTER);
 
@@ -47,10 +49,10 @@ BrowserActionButton::BrowserActionButton(const Extension* extension,
                  content::Source<ExtensionAction>(browser_action_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED,
                  content::Source<Profile>(
-                     panel_->profile()->GetOriginalProfile()));
+                     delegate_->GetBrowser()->profile()->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
                  content::Source<Profile>(
-                     panel_->profile()->GetOriginalProfile()));
+                     delegate_->GetBrowser()->profile()->GetOriginalProfile()));
 }
 
 void BrowserActionButton::Destroy() {
@@ -101,7 +103,7 @@ bool BrowserActionButton::CanHandleAccelerators() const {
 
 void BrowserActionButton::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
-  panel_->OnBrowserActionExecuted(this);
+  delegate_->OnBrowserActionExecuted(this);
 }
 
 void BrowserActionButton::OnImageLoaded(const gfx::Image& image,
@@ -116,7 +118,7 @@ void BrowserActionButton::OnImageLoaded(const gfx::Image& image,
 }
 
 void BrowserActionButton::UpdateState() {
-  int tab_id = panel_->GetCurrentTabId();
+  int tab_id = delegate_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
@@ -155,22 +157,19 @@ void BrowserActionButton::UpdateState() {
     SetPushedIcon(bg_p);
   }
 
-  // If the browser action name is empty, show the extension name instead.
-  string16 name = UTF8ToUTF16(browser_action()->GetTitle(tab_id));
-  if (name.empty())
-    name = UTF8ToUTF16(extension()->name());
-  SetTooltipText(name);
+  string16 name = GetTextForTooltip();

[Peter Kasting, 2012/07/14 02:08:01]

Nit: Inline in next statement (both shorter and more efficient)

[yefimt, 2012/07/17 18:20:37]

It is used in the next two lines, would it be better to get it one time, instead
of two?

On 2012/07/14 02:08:01, Peter Kasting wrote:

+  SetTooltipText(disable_tooltip_ ? string16() : name);
   SetAccessibleName(name);
   parent()->SchedulePaint();
 }
 
 bool BrowserActionButton::IsPopup() {
-  int tab_id = panel_->GetCurrentTabId();
+  int tab_id = delegate_->GetCurrentTabId();
   return (tab_id < 0) ? false : browser_action_->HasPopup(tab_id);
 }
 
 GURL BrowserActionButton::GetPopupUrl() {
-  int tab_id = panel_->GetCurrentTabId();
+  int tab_id = delegate_->GetCurrentTabId();
   return (tab_id < 0) ? GURL() : browser_action_->GetPopupUrl(tab_id);
 }
 
@@ -182,7 +181,7 @@ void BrowserActionButton::Observe(int type,
       UpdateState();
       // The browser action may have become visible/hidden so we need to make
       // sure the state gets updated.
-      panel_->OnBrowserActionVisibilityChanged();
+      delegate_->OnBrowserActionVisibilityChanged();
       break;
     case chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED:
     case chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED: {
@@ -209,7 +208,7 @@ bool BrowserActionButton::Activate() {
   if (!IsPopup())
     return true;
 
-  panel_->OnBrowserActionExecuted(this);
+  delegate_->OnBrowserActionExecuted(this);
 
   // TODO(erikkay): Run a nested modal loop while the mouse is down to
   // enable menu-like drag-select behavior.
@@ -265,7 +264,7 @@ void BrowserActionButton::ShowContextMenu(const gfx::Point& p,
 
   // Reconstructs the menu every time because the menu's contents are dynamic.
   scoped_refptr<ExtensionContextMenuModel> context_menu_contents_(
-      new ExtensionContextMenuModel(extension(), panel_->browser()));
+      new ExtensionContextMenuModel(extension(), delegate_->GetBrowser()));
   views::MenuModelAdapter menu_model_adapter(context_menu_contents_.get());
   views::MenuRunner menu_runner(menu_model_adapter.CreateMenu());
 
@@ -283,7 +282,7 @@ void BrowserActionButton::ShowContextMenu(const gfx::Point& p,
 
 bool BrowserActionButton::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
-  panel_->OnBrowserActionExecuted(this);
+  delegate_->OnBrowserActionExecuted(this);
   return true;
 }
 
@@ -297,13 +296,18 @@ void BrowserActionButton::SetButtonNotPushed() {
   menu_visible_ = false;
 }
 
+void BrowserActionButton::SetTooltipDisabled(bool disable_tooltip) {
+  disable_tooltip_ = disable_tooltip;
+  SetTooltipText(disable_tooltip_ ? string16() : GetTextForTooltip());
+}
+
 BrowserActionButton::~BrowserActionButton() {
 }
 
 void BrowserActionButton::MaybeRegisterExtensionCommand() {
   extensions::CommandService* command_service =
       extensions::CommandServiceFactory::GetForProfile(
-          panel_->browser()->profile());
+          delegate_->GetBrowser()->profile());
   extensions::Command browser_action_command;
   if (command_service->GetBrowserActionCommand(
           extension_->id(),
@@ -312,18 +316,18 @@ void BrowserActionButton::MaybeRegisterExtensionCommand() {
           NULL)) {
     keybinding_.reset(new ui::Accelerator(
         browser_action_command.accelerator()));
-    panel_->GetFocusManager()->RegisterAccelerator(
+    GetFocusManager()->RegisterAccelerator(
         *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
   }
 }
 
 void BrowserActionButton::MaybeUnregisterExtensionCommand(bool only_if_active) {
-  if (!keybinding_.get() || !panel_->GetFocusManager())
+  if (!keybinding_.get() || !GetFocusManager())
     return;
 
   extensions::CommandService* command_service =
       extensions::CommandServiceFactory::GetForProfile(
-          panel_->browser()->profile());
+          delegate_->GetBrowser()->profile());
 
   extensions::Command browser_action_command;
   if (!only_if_active || !command_service->GetBrowserActionCommand(
@@ -331,19 +335,30 @@ void BrowserActionButton::MaybeUnregisterExtensionCommand(bool only_if_active) {
           extensions::CommandService::ACTIVE_ONLY,
           &browser_action_command,
           NULL)) {
-    panel_->GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
+    GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
   }
 }
 
+string16 BrowserActionButton::GetTextForTooltip() {
+  int tab_id = delegate_->GetCurrentTabId();
+  if (tab_id < 0)
+    return string16();
+
+  // If the browser action name is empty, show the extension name instead.
+  string16 name = UTF8ToUTF16(browser_action()->GetTitle(tab_id));
+  if (name.empty())
+    name = UTF8ToUTF16(extension()->name());
+  return name;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView

[Peter Kasting, 2012/07/14 02:08:01]

Nit: Class definition order must match declaration order (BrowserActionView was
declared before BrowserActionButton)

[yefimt, 2012/07/17 18:20:37]

Done
I thought it will be easier to review if I keep original order

On 2012/07/14 02:08:01, Peter Kasting wrote:

 
 BrowserActionView::BrowserActionView(const Extension* extension,
-                                     BrowserActionsContainer* panel)
-    : panel_(panel) {
-  button_ = new BrowserActionButton(extension, panel);
-  button_->set_drag_controller(panel_);
+                                     BrowserActionView::Delegate* delegate)
+    : delegate_(delegate) {
+  button_ = new BrowserActionButton(extension, delegate_);
+  button_->set_drag_controller(delegate_);
   AddChildView(button_);
   button_->UpdateState();
 }
@@ -354,7 +369,7 @@ BrowserActionView::~BrowserActionView() {
 }
 
 gfx::Canvas* BrowserActionView::GetIconWithBadge() {
-  int tab_id = panel_->GetCurrentTabId();
+  int tab_id = delegate_->GetCurrentTabId();
 
   SkBitmap icon = button_->extension()->browser_action()->GetIcon(tab_id);
   if (icon.isNull())
@@ -379,7 +394,8 @@ void BrowserActionView::Layout() {
   // since the bounds don't change).  So instead of setting the height from the
   // button's preferred size, we use IconHeight(), since that's how big the
   // button should be regardless of what it's displaying.
-  button_->SetBounds(0, ToolbarView::kVertSpacing, width(),
+  gfx::Size size = delegate_->GetViewContentOffset();
+  button_->SetBounds(size.width(), size.height(), width(),
                      BrowserActionsContainer::IconHeight());
 }
 
@@ -389,10 +405,15 @@ void BrowserActionView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
+gfx::Size BrowserActionView::GetPreferredSize() {
+  return gfx::Size(BrowserActionsContainer::IconWidth(false),
+                   BrowserActionsContainer::IconHeight());
+}
+
 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   ExtensionAction* action = button()->browser_action();
-  int tab_id = panel_->GetCurrentTabId();
+  int tab_id = delegate_->GetCurrentTabId();
   if (tab_id >= 0)
     action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id);
 }