Revert of Rename BrowserActionView to ToolbarActionView

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

Index: chrome/browser/ui/views/toolbar/browser_action_view.h
diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.h b/chrome/browser/ui/views/toolbar/browser_action_view.h
new file mode 100644
index 0000000000000000000000000000000000000000..8f864c7739d7178552acab68f704036e463b5966
--- /dev/null
+++ b/chrome/browser/ui/views/toolbar/browser_action_view.h
@@ -0,0 +1,166 @@
+// 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.
+
+#ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTION_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTION_VIEW_H_
+
+#include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
+#include "ui/views/controls/button/menu_button.h"
+#include "ui/views/controls/button/menu_button_listener.h"
+#include "ui/views/drag_controller.h"
+#include "ui/views/view.h"
+
+class Browser;
+class ExtensionAction;
+
+namespace extensions {
+class Extension;
+}
+
+namespace gfx {
+class Image;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// BrowserActionView
+// A wrapper around a ToolbarActionViewController to display a toolbar action
+// action in the BrowserActionsContainer.
+// Despite its name, this class can handle any type of toolbar action, including
+// extension actions (browser and page actions) and component actions.
+// TODO(devlin): Rename this and BrowserActionsContainer when more of the
+// toolbar redesign is done.
+class BrowserActionView : public views::MenuButton,
+                          public ToolbarActionViewDelegate,
+                          public views::ButtonListener,
+                          public content::NotificationObserver {
+ public:
+  // Need DragController here because BrowserActionView could be
+  // dragged/dropped.
+  class Delegate : public views::DragController {
+   public:
+    // Returns the current web contents.
+    virtual content::WebContents* GetCurrentWebContents() = 0;
+
+    // Whether the container for this button is shown inside a menu.
+    virtual bool ShownInsideMenu() const = 0;
+
+    // Notifies that a drag completed. Note this will only happen if the view
+    // wasn't removed during the drag-and-drop process (i.e., not when there
+    // was a move in the browser actions, since we re-create the views each
+    // time we re-order the browser actions).
+    virtual void OnBrowserActionViewDragDone() = 0;
+
+    // Returns the view of the browser actions overflow menu to use as a
+    // reference point for a popup when this view isn't visible.
+    virtual views::MenuButton* GetOverflowReferenceView() = 0;
+
+    // Sets the delegate's active popup owner to be |popup_owner|.
+    virtual void SetPopupOwner(BrowserActionView* popup_owner) = 0;
+
+    // Hides the active popup of the delegate, if one exists.
+    virtual void HideActivePopup() = 0;
+
+    // Returns the primary BrowserActionView associated with the given
+    // |extension|.
+    virtual BrowserActionView* GetMainViewForAction(
+        BrowserActionView* view) = 0;
+
+   protected:
+    virtual ~Delegate() {}
+  };
+
+  BrowserActionView(scoped_ptr<ToolbarActionViewController> view_controller,
+                    Browser* browser,
+                    Delegate* delegate);
+  virtual ~BrowserActionView();
+
+  // Called to update the display to match the browser action's state.
+  void UpdateState();
+
+  // Overridden from views::View:
+  virtual void GetAccessibleState(ui::AXViewState* state) override;
+
+  // Overridden from views::ButtonListener:
+  virtual void ButtonPressed(views::Button* sender,
+                             const ui::Event& event) override;
+
+  // Overridden from content::NotificationObserver:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) override;
+
+  // MenuButton behavior overrides.  These methods all default to LabelButton
+  // 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() override;
+  virtual bool OnMousePressed(const ui::MouseEvent& event) override;
+  virtual void OnMouseReleased(const ui::MouseEvent& event) override;
+  virtual void OnMouseExited(const ui::MouseEvent& event) override;
+  virtual bool OnKeyReleased(const ui::KeyEvent& event) override;
+  virtual void OnGestureEvent(ui::GestureEvent* event) override;
+  virtual scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const
+      override;
+
+  // ToolbarActionViewDelegate: (public because called by others).
+  virtual content::WebContents* GetCurrentWebContents() const override;
+
+  ToolbarActionViewController* view_controller() {
+    return view_controller_.get();
+  }
+  Browser* browser() { return browser_; }
+
+  // Returns button icon so it can be accessed during tests.
+  gfx::ImageSkia GetIconForTest();
+
+ private:
+  // Overridden from views::View:
+  virtual void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) override;
+  virtual void OnDragDone() override;
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual void PaintChildren(gfx::Canvas* canvas,
+                             const views::CullSet& cull_set) override;
+
+  // ToolbarActionViewDelegate:
+  virtual views::View* GetAsView() override;
+  virtual bool IsShownInMenu() override;
+  virtual views::FocusManager* GetFocusManagerForAccelerator() override;
+  virtual views::Widget* GetParentForContextMenu() override;
+  virtual ToolbarActionViewController* GetPreferredPopupViewController()
+      override;
+  virtual views::View* GetReferenceViewForPopup() override;
+  virtual views::MenuButton* GetContextMenuButton() override;
+  virtual void HideActivePopup() override;
+  virtual void OnIconUpdated() override;
+  virtual void OnPopupShown(bool grant_tab_permissions) override;
+  virtual void CleanupPopup() override;
+
+  // A lock to keep the MenuButton pressed when a menu or popup is visible.
+  // This needs to be destroyed after |view_controller_|, because
+  // |view_controller_|'s destructor can call CleanupPopup(), which uses this
+  // object.
+  scoped_ptr<views::MenuButton::PressedLock> pressed_lock_;
+
+  // The controller for this toolbar action view.
+  scoped_ptr<ToolbarActionViewController> view_controller_;
+
+  // The associated browser.
+  Browser* browser_;
+
+  // Delegate that usually represents a container for BrowserActionView.
+  Delegate* delegate_;
+
+  // Used to make sure we only register the command once.
+  bool called_register_command_;
+
+  content::NotificationRegistrar registrar_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserActionView);
+};
+
+#endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTION_VIEW_H_