Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i…

chrome/browser/ui/browser.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_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 34 matching lines @@
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/page_zoom.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 
-class BrowserContentSettingBubbleModelDelegate;
 class BrowserSyncedWindowDelegate;
-class BrowserToolbarModelDelegate;
 class BrowserTabRestoreServiceDelegate;
 class BrowserWindow;
 class Extension;
 class ExtensionWindowController;
 class FindBarController;
 class FullscreenController;
 class HtmlDialogUIDelegate;
 class InstantController;
 class InstantUnloadHandler;
 class PrefService;
@@ skipping 161 matching lines @@
   Profile* profile() const { return profile_; }
   gfx::Rect override_bounds() const { return override_bounds_; }
 
   // Returns the InstantController or NULL if there is no InstantController for
   // this Browser.
   InstantController* instant() const { return instant_.get(); }
 
   // |window()| will return NULL if called before |CreateBrowserWindow()|
   // is done.
   BrowserWindow* window() const { return window_; }
-  ToolbarModel* toolbar_model() { return toolbar_model_.get(); }
+  ToolbarModel* toolbar_model() { return &toolbar_model_; }
   const SessionID& session_id() const { return session_id_; }
   CommandUpdater* command_updater() { return &command_updater_; }
   bool block_command_execution() const { return block_command_execution_; }
-  BrowserContentSettingBubbleModelDelegate*
-      content_setting_bubble_model_delegate() {
-    return content_setting_bubble_model_delegate_.get();
-  }
   BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() {
     return tab_restore_service_delegate_.get();
   }
   BrowserSyncedWindowDelegate* synced_window_delegate() {
     return synced_window_delegate_.get();
   }
 
   // Get the FindBarController for this browser, creating it if it does not
   // yet exist.
   FindBarController* GetFindBarController();
@@ skipping 491 matching lines @@
                               bool final_update);
 
   // Helper function to handle crashed plugin notifications.
   static void CrashedPluginHelper(content::WebContents* tab,
                                   const FilePath& plugin_path);
 
   // Helper function to handle url update notifications.
   static void UpdateTargetURLHelper(content::WebContents* tab, int32 page_id,
                                     const GURL& url);
 
-  // Calls ExecuteCommandWithDisposition with CURRENT_TAB disposition.
-  void ExecuteCommand(int id);
+  // Calls ExecuteCommandWithDisposition with the given disposition.
+  void ExecuteCommandWithDisposition(int id, WindowOpenDisposition);
 
   // Calls ExecuteCommandWithDisposition with the given event flags.
   void ExecuteCommand(int id, int event_flags);
 
   // Executes a command if it's enabled.
   // Returns true if the command is executed.
   bool ExecuteCommandIfEnabled(int id);
 
   // Returns true if |command_id| is a reserved command whose keyboard shortcuts
   // should not be sent to the renderer or |event| was triggered by a key that
@@ skipping 22 matching lines @@
   // Shows the cookies collected in the tab contents wrapper.
   void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper);
 
   // Interface implementations ////////////////////////////////////////////////
 
   // Overridden from content::PageNavigator:
   virtual content::WebContents* OpenURL(
       const content::OpenURLParams& params) OVERRIDE;
 
   // Overridden from CommandUpdater::CommandUpdaterDelegate:
-  virtual void ExecuteCommandWithDisposition(
-      int id,
-      WindowOpenDisposition disposition) OVERRIDE;
+  virtual void ExecuteCommand(int id) OVERRIDE;
 
   // Overridden from TabRestoreServiceObserver:
   virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE;
 
   // Centralized method for creating a TabContents, configuring and installing
   // all its supporting objects and observers.
   static TabContentsWrapper* TabContentsFactory(
       Profile* profile,
       content::SiteInstance* site_instance,
@@ skipping 548 matching lines @@
   // 1) we launch an application via an application shortcut or extension API.
   // 2) we launch an undocked devtool window.
   std::string app_name_;
 
   // Unique identifier of this browser for session restore. This id is only
   // unique within the current session, and is not guaranteed to be unique
   // across sessions.
   const SessionID session_id_;
 
   // The model for the toolbar view.
-  scoped_ptr<ToolbarModel> toolbar_model_;
+  ToolbarModel toolbar_model_;
 
   // UI update coalescing and handling ////////////////////////////////////////
 
   typedef std::map<const content::WebContents*, int> UpdateMap;
 
   // Maps from TabContents to pending UI updates that need to be processed.
   // We don't update things like the URL or tab title right away to avoid
   // flickering and extra painting.
   // See ScheduleUIUpdate and ProcessPendingUIUpdates.
   UpdateMap scheduled_updates_;
@@ skipping 73 matching lines @@
   };
 
   // Which deferred action to perform when OnDidGetApplicationInfo is notified
   // from a TabContents. Currently, only one pending action is allowed.
   WebAppAction pending_web_app_action_;
 
   // The profile's tab restore service. The service is owned by the profile,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
-  // Helper which implements the ContentSettingBubbleModel interface.
-  scoped_ptr<BrowserContentSettingBubbleModelDelegate>
-      content_setting_bubble_model_delegate_;
-
-  // Helper which implements the ToolbarModelDelegate interface.
-  scoped_ptr<BrowserToolbarModelDelegate> toolbar_model_delegate_;
-
   // Helper which implements the TabRestoreServiceDelegate interface.
   scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
 
   // Helper which implements the SyncedWindowDelegate interface.
   scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_;
 
   scoped_ptr<InstantController> instant_;
   scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
 
   BookmarkBar::State bookmark_bar_state_;
 
   scoped_refptr<FullscreenController> fullscreen_controller_;
 
   scoped_ptr<ExtensionWindowController> extension_window_controller_;
 
   // True if the browser window has been shown at least once.
   bool window_has_shown_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_