Action box menu

chrome/browser/ui/views/browser_actions_container.h

 // Copyright (c) 2012 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_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include "chrome/browser/extensions/extension_toolbar_model.h"
+#include "chrome/browser/ui/views/browser_action_view.h"
 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "content/public/browser/notification_observer.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/tween.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/resize_area_delegate.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/view.h"
@@ skipping 78 matching lines @@
 // NOTE: When adding Browser Actions to a maximum width container (no overflow)
 // we make sure to suppress the chevron menu if it wasn't visible. This is
 // because we won't have enough space to show the new Browser Action until the
 // animation ends and we don't want the chevron to flash into view while we are
 // growing the container.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class BrowserActionsContainer
     : public views::View,
       public views::MenuButtonListener,
-      public views::DragController,
       public views::ResizeAreaDelegate,
       public ui::AnimationDelegate,
       public ExtensionToolbarModel::Observer,
       public BrowserActionOverflowMenuController::Observer,
-      public views::Widget::Observer {
+      public views::Widget::Observer,
+      public BrowserActionView::Delegate {
  public:
   BrowserActionsContainer(Browser* browser, views::View* owner_view);
   virtual ~BrowserActionsContainer();
 
   void Init();
 
   // Get the number of browser actions being displayed.
   int num_browser_actions() const { return browser_action_views_.size(); }
 
   // Whether we are performing resize animation on the container.
   bool animating() const { return animation_target_size_ > 0; }
 
   // Returns the chevron, if any.
   views::View* chevron() { return chevron_; }
   const views::View* chevron() const { return chevron_; }
 
   // Returns the profile this container is associated with.
   Profile* profile() const { return profile_; }
 
-  // Returns the browser this container is associated with.
-  Browser* browser() const { return browser_; }
-
-  // Returns the current tab's ID, or -1 if there is no current tab.
-  int GetCurrentTabId() const;
-
   // Get a particular browser action view.
   BrowserActionView* GetBrowserActionViewAt(int index) {
     return browser_action_views_[index];
   }
 
   // Retrieve the BrowserActionView for |extension|.
   BrowserActionView* GetBrowserActionView(ExtensionAction* action);
 
   // Update the views to reflect the state of the browser action icons.
   void RefreshBrowserActionViews();
 
   // Sets up the browser action view vector.
   void CreateBrowserActionViews();
 
   // Delete all browser action views.
   void DeleteBrowserActionViews();
 
-  // Called when a browser action becomes visible/hidden.
-  void OnBrowserActionVisibilityChanged();
-
   // Returns how many browser actions are visible.
   size_t VisibleBrowserActions() const;
 
-  // Called when the user clicks on the browser action icon.
-  void OnBrowserActionExecuted(BrowserActionButton* button);
-
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual bool GetDropFormats(int* formats,
       std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
   virtual bool AreDropTypesRequired() OVERRIDE;
   virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
   virtual void OnDragEntered(const views::DropTargetEvent& event) OVERRIDE;
   virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
   virtual void OnDragExited() OVERRIDE;
@@ skipping 21 matching lines @@
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
   virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
 
   // Overridden from BrowserActionOverflowMenuController::Observer:
   virtual void NotifyMenuDeleted(
       BrowserActionOverflowMenuController* controller) OVERRIDE;
 
   // Overridden from views::Widget::Observer
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
 
+  // Overridden from BrowserActionView::Delegate:
+  virtual Browser* GetBrowser() const;

[Peter Kasting, 2012/07/21 01:55:13]

This should be removed, as it's no longer overriding anything.

BrowserActionOverflowMenuController can take the Browser as a constructor
argument to avoid reintroducing the browser() accessor on this class.

[yefimt, 2012/07/23 23:47:52]

Done.

+  virtual int GetCurrentTabId() const OVERRIDE;
+  virtual void OnBrowserActionExecuted(BrowserActionButton* button) OVERRIDE;
+  virtual void OnBrowserActionVisibilityChanged() OVERRIDE;
+  virtual gfx::Size GetViewContentOffset() const OVERRIDE;
+
   // Moves a browser action with |id| to |new_index|.
   void MoveBrowserAction(const std::string& extension_id, size_t new_index);
 
   // Hide the current popup.
   void HidePopup();
 
   // Simulate a click on a browser action button.  This should only be
   // used by unit tests.
   void TestExecuteBrowserAction(int index);
 
@@ skipping 148 matching lines @@
 
   base::WeakPtrFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_