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

chrome/browser/views/browser_actions_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include <vector>
 
 #include "base/task.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/views/browser_bubble.h"
-#include "chrome/browser/views/extensions/extension_action_context_menu.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "views/controls/button/menu_button.h"
 #include "views/view.h"
 
 class BrowserActionsContainer;
 class Extension;
 class ExtensionAction;
 class ExtensionPopup;
 class Profile;
@@ skipping 12 matching lines @@
  public:
   BrowserActionButton(Extension* extension, BrowserActionsContainer* panel);
   ~BrowserActionButton();
 
   ExtensionAction* browser_action() const { return browser_action_; }
   Extension* extension() { return extension_; }
 
   // Called to update the display to match the browser action's state.
   void UpdateState();
 
-  // Overridden from views::View. Return a 0-inset so the icon can draw all the
+  // Overriden from views::View. Return a 0-inset so the icon can draw all the
   // way to the edge of the view if it wants.
   virtual gfx::Insets GetInsets() const;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
   // Overridden from ImageLoadingTracker.
   virtual void OnImageLoaded(SkBitmap* image, size_t index);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // MenuButton behavior overrides.  These methods all default to TextButton
   // behavior unless this button is a popup.  In that case, it uses MenuButton
   // behavior.  MenuButton has the notion of a child popup being shown where the
   // button will stay in the pushed state until the "menu" (a popup in this
   // case) is dismissed.
   virtual bool Activate();
   virtual bool OnMousePressed(const views::MouseEvent& e);
   virtual void OnMouseReleased(const views::MouseEvent& e, bool canceled);
   virtual bool OnKeyReleased(const views::KeyEvent& e);
   virtual void OnMouseExited(const views::MouseEvent& event);
 
   // Does this button's action have a popup?
   virtual bool IsPopup();
 
-  // Notifications when to set button state to pushed/not pushed (for when the
-  // popup/context menu is hidden or shown by the container).
-  virtual void SetButtonPushed();
-  virtual void SetButtonNotPushed();
+  // Notifications when the popup is hidden or shown by the container.
+  virtual void PopupDidShow();
+  virtual void PopupDidHide();
 
  private:
   // The browser action this view represents. The ExtensionAction is not owned
   // by this class.
   ExtensionAction* browser_action_;
 
   // The extension associated with the browser action we're displaying.
   Extension* extension_;
 
   // The object that is waiting for the image loading to complete
   // asynchronously. This object can potentially outlive the BrowserActionView,
   // and takes care of deleting itself.
   ImageLoadingTracker* tracker_;
 
-  // The context menu for browser action icons.
-  scoped_ptr<ExtensionActionContextMenu> context_menu_;
-
-  // Whether we are currently showing/just finished showing a context menu.
-  bool showing_context_menu_;
-
   // The default icon for our browser action. This might be non-empty if the
   // browser action had a value for default_icon in the manifest.
   SkBitmap default_icon_;
 
   // The browser action shelf.
   BrowserActionsContainer* panel_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionButton);
@@ skipping 120 matching lines @@
   // The button that triggered the current popup (just a reference to a button
   // from browser_action_views_).
   BrowserActionButton* popup_button_;
 
   ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_