Revert of Views - init less stuff in tabless browsers.

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

 // 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_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
+#include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
+#include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/toolbar/chevron_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/views/controls/resize_area_delegate.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget_observer.h"
 
@@ skipping 91 matching lines @@
 // size (animation_target_size_), using |resize_amount| to keep track of the
 // animation progress.
 //
 // 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 ToolbarActionsBarDelegate,
-                                public views::ResizeAreaDelegate,
-                                public gfx::AnimationDelegate,
-                                public ToolbarActionView::Delegate,
-                                public views::WidgetObserver {
+class BrowserActionsContainer
+    : public views::View,
+      public ToolbarActionsBarDelegate,
+      public views::ResizeAreaDelegate,
+      public gfx::AnimationDelegate,
+      public ToolbarActionView::Delegate,
+      public views::WidgetObserver,
+      public extensions::ExtensionKeybindingRegistry::Delegate {
  public:
   // Constructs a BrowserActionContainer for a particular |browser| object. For
   // documentation of |main_container|, see class comments.
   BrowserActionsContainer(Browser* browser,
                           BrowserActionsContainer* main_container);
   ~BrowserActionsContainer() override;
 
   void Init();
 
   // Get the number of toolbar actions being displayed.
   size_t num_toolbar_actions() const { return toolbar_action_views_.size(); }
 
   // Returns the chevron, if any.
   views::View* chevron() { return chevron_; }
   const views::View* chevron() const { return chevron_; }
 
   // Returns the browser this container is associated with.
   Browser* browser() const { return browser_; }
 
   ToolbarActionsBar* toolbar_actions_bar() {
     return toolbar_actions_bar_.get();
   }
 
+  // The class that registers for keyboard shortcuts for extension commands.
+  extensions::ExtensionKeybindingRegistry* extension_keybinding_registry() {
+    return extension_keybinding_registry_.get();
+  }
+
   // Get a particular toolbar action view.
   ToolbarActionView* GetToolbarActionViewAt(int index) {
     return toolbar_action_views_[index];
   }
 
   // Whether we are performing resize animation on the container.
   bool animating() const {
     return resize_animation_ && resize_animation_->is_animating();
   }
 
   // Returns the ID of the action represented by the view at |index|.
   std::string GetIdAt(size_t index) const;
 
   // Returns the ToolbarActionView* associated with the given |extension|, or
   // NULL if none exists.
   ToolbarActionView* GetViewForId(const std::string& id);
 
   // Update the views to reflect the state of the toolbar actions.
   void RefreshToolbarActionViews();
 
   // Returns how many actions are currently visible. If the intent is to find
   // how many are visible once the container finishes animation, see
   // VisibleBrowserActionsAfterAnimation() below.
   size_t VisibleBrowserActions() const;
 
   // Returns how many actions will be visible once the container finishes
   // animating to a new size, or (if not animating) the currently visible icons.
   size_t VisibleBrowserActionsAfterAnimation() const;
 
+  // Executes |command| registered by |extension|.
+  void ExecuteExtensionCommand(const extensions::Extension* extension,
+                               const extensions::Command& command);
+
   // Returns the preferred width given the limit of |max_width|. (Unlike most
   // views, since we don't want to show part of an icon or a large space after
   // the omnibox, this is probably *not* |max_width|).
   int GetWidthForMaxWidth(int max_width) const;
 
   // Overridden from views::View:
   gfx::Size GetPreferredSize() const override;
   int GetHeightForWidth(int width) const override;
   gfx::Size GetMinimumSize() const override;
   void Layout() override;
@@ skipping 47 matching lines @@
   void StopAnimating() override;
   int GetChevronWidth() const override;
   void ShowExtensionMessageBubble(
       scoped_ptr<extensions::ExtensionMessageBubbleController> controller,
       ToolbarActionViewController* anchor_action) override;
 
   // views::WidgetObserver:
   void OnWidgetClosing(views::Widget* widget) override;
   void OnWidgetDestroying(views::Widget* widget) override;
 
+  // Overridden from extension::ExtensionKeybindingRegistry::Delegate:
+  extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter()
+      override;
+
   views::BubbleDelegateView* active_bubble() { return active_bubble_; }
 
   ChevronMenuButton* chevron_for_testing() { return chevron_; }
 
  protected:
   // Overridden from views::View:
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
   void OnPaint(gfx::Canvas* canvas) override;
   void OnThemeChanged() override;
@@ skipping 64 matching lines @@
   int resize_amount_;
 
   // Keeps track of the absolute pixel width the container should have when we
   // are done animating.
   int animation_target_size_;
 
   // The DropPosition for the current drag-and-drop operation, or NULL if there
   // is none.
   scoped_ptr<DropPosition> drop_position_;
 
+  // The class that registers for keyboard shortcuts for extension commands.
+  scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
+
   // The extension bubble that is actively showing, if any.
   views::BubbleDelegateView* active_bubble_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_