Revert 34858 - Merge 34812 Add the rightclick context menu for Browser actio...

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2009 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/views/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 36 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionButton
 
 BrowserActionButton::BrowserActionButton(Extension* extension,
                                          BrowserActionsContainer* panel)
     : MenuButton(this, L"", NULL, false),
       browser_action_(extension->browser_action()),
       extension_(extension),
       tracker_(NULL),
-      showing_context_menu_(false),
       panel_(panel) {
   set_alignment(TextButton::ALIGN_CENTER);
 
-  // No UpdateState() here because View hierarchy not setup yet. Our parent
+  // No UpdateState() here because View heirarchy not setup yet. Our parent
   // should call UpdateState() after creation.
 
   registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
                  Source<ExtensionAction>(browser_action_));
 
   // The Browser Action API does not allow the default icon path to be changed
   // at runtime, so we can load this now and cache it.
   std::string relative_path = browser_action_->default_icon_path();
   if (relative_path.empty())
     return;
@@ skipping 75 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;
   }
   return true;
 }
 
 bool BrowserActionButton::OnMousePressed(const views::MouseEvent& e) {
-  showing_context_menu_ = e.IsRightMouseButton();
-  if (showing_context_menu_) {
-    SetButtonPushed();
-
-    // Get the top left point of this button in screen coordinates.
-    gfx::Point point = gfx::Point(0, 0);
-    ConvertPointToScreen(this, &point);
-
-    // Make the menu appear below the button.
-    point.Offset(0, height());
-
-    if (!context_menu_.get())
-      context_menu_.reset(new ExtensionActionContextMenu());
-    context_menu_->Run(extension(), point);
-
-    SetButtonNotPushed();
-    return false;
-  } else if (IsPopup()) {
+  if (IsPopup())
     return MenuButton::OnMousePressed(e);
-  }
   return TextButton::OnMousePressed(e);
 }
 
 void BrowserActionButton::OnMouseReleased(const views::MouseEvent& e,
                                           bool canceled) {
-  if (IsPopup() || showing_context_menu_) {
+  if (IsPopup()) {
     // TODO(erikkay) this never actually gets called (probably because of the
     // loss of focus).
     MenuButton::OnMouseReleased(e, canceled);
   } else {
     TextButton::OnMouseReleased(e, canceled);
   }
 }
 
 bool BrowserActionButton::OnKeyReleased(const views::KeyEvent& e) {
   if (IsPopup())
     return MenuButton::OnKeyReleased(e);
   return TextButton::OnKeyReleased(e);
 }
 
 void BrowserActionButton::OnMouseExited(const views::MouseEvent& e) {
-  if (IsPopup() || showing_context_menu_)
+  if (IsPopup())
     MenuButton::OnMouseExited(e);
   else
     TextButton::OnMouseExited(e);
 }
 
-void BrowserActionButton::SetButtonPushed() {
+void BrowserActionButton::PopupDidShow() {
   SetState(views::CustomButton::BS_PUSHED);
   menu_visible_ = true;
 }
 
-void BrowserActionButton::SetButtonNotPushed() {
+void BrowserActionButton::PopupDidHide() {
   SetState(views::CustomButton::BS_NORMAL);
   menu_visible_ = false;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView
 
 BrowserActionView::BrowserActionView(Extension* extension,
                                      BrowserActionsContainer* panel)
@@ skipping 140 matching lines @@
     // Save these variables in local temporaries since destroying the popup
     // calls BubbleLostFocus to be called, which will try to call HidePopup()
     // again if popup_ is non-null.
     ExtensionPopup* closing_popup = popup_;
     BrowserActionButton* closing_button = popup_button_;
     popup_ = NULL;
     popup_button_ = NULL;
 
     closing_popup->DetachFromBrowser();
     delete closing_popup;
-    closing_button->SetButtonNotPushed();
+    closing_button->PopupDidHide();
     return;
   }
 }
 
 void BrowserActionsContainer::TestExecuteBrowserAction(int index) {
   BrowserActionButton* button = browser_action_views_[index]->button();
   OnBrowserActionExecuted(button);
 }
 
 void BrowserActionsContainer::OnBrowserActionExecuted(
@@ skipping 17 matching lines @@
     View::ConvertPointToScreen(button, &origin);
     gfx::Rect rect = button->bounds();
     rect.set_x(origin.x());
     rect.set_y(origin.y());
     popup_ = ExtensionPopup::Show(browser_action->popup_url(),
                                   toolbar_->browser(),
                                   rect,
                                   BubbleBorder::TOP_RIGHT);
     popup_->set_delegate(this);
     popup_button_ = button;
-    popup_button_->SetButtonPushed();
+    popup_button_->PopupDidShow();
     return;
   }
 
   // Otherwise, we send the action to the extension.
   ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
       profile_, browser_action->extension_id(), toolbar_->browser());
 }
 
 gfx::Size BrowserActionsContainer::GetPreferredSize() {
   if (browser_action_views_.empty())
@@ skipping 84 matching lines @@
       std::min(static_cast<int>(browser_action_views_.size()),
                kMinimumNumberOfVisibleBrowserActions) * kButtonSize;
 
   // Even if available_width is <= 0, we still return at least the |min_width|.
   if (available_width <= 0)
     return min_width;
 
   return std::max(min_width, available_width - available_width % kButtonSize +
                   kHorizontalPadding * 2);
 }