Revert of Views - init less stuff in tabless browsers.

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

Index: chrome/browser/ui/views/toolbar/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index d41a4465d6eece28fd0a12c0af5d22dd3781deed..2c54a9dfe289bb31d91dc9be6ebbeeab28e7aa5e 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -40,6 +40,7 @@ class ToolbarView : public views::AccessiblePaneView,
                     public content::NotificationObserver,
                     public CommandObserver,
                     public views::ButtonListener,
+                    public views::WidgetObserver,
                     public views::ViewTargeterDelegate,
                     public AppMenuBadgeController::Delegate {
  public:
@@ -85,6 +86,10 @@ class ToolbarView : public views::AccessiblePaneView,
   void OnBubbleCreatedForAnchor(views::View* anchor_view,
                                 views::Widget* bubble_widget);
 
+  // Executes |command| registered by |extension|.
+  void ExecuteExtensionCommand(const extensions::Extension* extension,
+                               const extensions::Command& command);
+
   // Returns the maximum width the browser actions container can have.
   int GetMaxBrowserActionsWidth() const;
 
@@ -130,6 +135,9 @@ class ToolbarView : public views::AccessiblePaneView,
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
+  // views::WidgetObserver:
+  void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
+
   // content::NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
@@ -199,8 +207,7 @@ class ToolbarView : public views::AccessiblePaneView,
 
   int content_shadow_height() const;
 
-  // Controls. Most of these can be null, e.g. in popup windows. Only
-  // |location_bar_| is guaranteed to exist.
+  // Controls
   BackButton* back_;
   ToolbarButton* forward_;
   ReloadButton* reload_;
@@ -208,7 +215,6 @@ class ToolbarView : public views::AccessiblePaneView,
   LocationBarView* location_bar_;
   BrowserActionsContainer* browser_actions_;
   AppMenuButton* app_menu_button_;
-
   Browser* browser_;
 
   AppMenuBadgeController badge_controller_;
@@ -217,7 +223,7 @@ class ToolbarView : public views::AccessiblePaneView,
   BooleanPrefMember show_home_button_;
 
   // The display mode used when laying out the toolbar.
-  const DisplayMode display_mode_;
+  DisplayMode display_mode_;
 
   content::NotificationRegistrar registrar_;