Re-factor location bar/toolbar code to get rid of the browser dependency.

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 16 matching lines @@
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/tabs/tab_handler.h"
 #include "chrome/browser/tabs/tab_strip_model_delegate.h"  // TODO(beng): remove
 #include "chrome/browser/tabs/tab_strip_model_observer.h"  // TODO(beng): remove
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/browser/ui/select_file_dialog.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper_container.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/content_settings.h"
 #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"
@@ skipping 31 matching lines @@
                 public CoreTabHelperDelegate,
                 public SearchEngineTabHelperDelegate,
                 public ConstrainedWindowTabHelperDelegate,
                 public BlockedContentTabHelperDelegate,
                 public BookmarkTabHelperDelegate,
                 public ExtensionTabHelperDelegate,
                 public content::PageNavigator,
                 public CommandUpdater::CommandUpdaterDelegate,
                 public content::NotificationObserver,
                 public SelectFileDialog::Listener,
+                public TabContentsWrapperContainer,
+                public ContentSettingBubbleModelDelegate,
                 public TabRestoreServiceObserver,
                 public ProfileSyncServiceObserver,
                 public InstantDelegate {
  public:
   // SessionService::WindowType mirrors these values.  If you add to this
   // enum, look at SessionService::WindowType to see if it needs to be
   // updated.
   enum Type {
     // If you add a new type, consider updating the test
     // BrowserTest.StartMaximized.
@@ skipping 292 matching lines @@
   DownloadClosePreventionType OkToCloseWithInProgressDownloads(
       int* num_downloads_blocking) const;
 
   // TabStripModel pass-thrus /////////////////////////////////////////////////
 
   TabStripModel* tabstrip_model() const {
     // TODO(beng): remove this accessor. It violates google style.
     return tab_handler_->GetTabStripModel();
   }
 
-  int tab_count() const;
-  int active_index() const;
-  int GetIndexOfController(
-      const content::NavigationController* controller) const;
-
-  // TODO(dpapad): Rename to GetActiveTabContentsWrapper().
-  TabContentsWrapper* GetSelectedTabContentsWrapper() const;
-  // A convenient version of the above which returns the TCW's WebContents.
-  content::WebContents* GetSelectedWebContents() const;
-  TabContentsWrapper* GetTabContentsWrapperAt(int index) const;
-  // A convenient version of the above which returns the TCW's WebContents.
-  content::WebContents* GetWebContentsAt(int index) const;
   void ActivateTabAt(int index, bool user_gesture);
   bool IsTabPinned(int index) const;
   bool IsTabDiscarded(int index) const;
   void CloseAllTabs();
 
   // Tab adding/showing functions /////////////////////////////////////////////
 
   // Returns true if the tab strip is editable (for extensions).
   bool IsTabStripEditable() const;
 
@@ skipping 205 matching lines @@
   void OpenBookmarkManagerEditNode(int64 node_id);
   void OpenBookmarkManagerAddNodeIn(int64 node_id);
   void ShowAppMenu();
   void ShowAvatarMenu();
   void ShowHistoryTab();
   void ShowDownloadsTab();
   void ShowExtensionsTab();
   void ShowAboutConflictsTab();
   void ShowBrokenPageTab(content::WebContents* contents);
   void ShowOptionsTab(const std::string& sub_page);
-  // Shows the Content Settings page for a given content type.
-  void ShowContentSettingsPage(ContentSettingsType content_type);
   void OpenClearBrowsingDataDialog();
   void OpenOptionsDialog();
   void OpenPasswordManager();
   void OpenSyncMyBookmarksDialog();
   void OpenImportSettingsDialog();
   void OpenInstantConfirmDialog();
   void OpenAboutChromeDialog();
   void OpenUpdateChromeDialog();
   void ShowHelpTab();
   void OpenAutofillHelpTabAndActivate();
@@ skipping 120 matching lines @@
   // disposition type of the command will be stored in |*disposition| if it's
   // not null.
   int GetLastBlockedCommand(WindowOpenDisposition* disposition);
 
   // Called by browser::Navigate() when a navigation has occurred in a tab in
   // this Browser. Updates the UI for the start of this navigation.
   void UpdateUIForNavigationInTab(TabContentsWrapper* contents,
                                   content::PageTransition transition,
                                   bool user_initiated);
 
-  // Shows the cookies collected in the tab contents wrapper.
-  void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper);
+  // Interface implementations ////////////////////////////////////////////////
 
-  // Interface implementations ////////////////////////////////////////////////
+  // Overridden from ContentSettingBubbleModelDelegate:
+  virtual void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) OVERRIDE;
+  virtual void ShowContentSettingsPage(
+      ContentSettingsType content_type) OVERRIDE;
+
+  // Overriddent from TabContentsWrapperContainer:
+  virtual int tab_count() const OVERRIDE;
+  virtual int active_index() const OVERRIDE;
+  virtual int GetIndexOfController(
+      const content::NavigationController* controller) const OVERRIDE;
+  virtual TabContentsWrapper* GetSelectedTabContentsWrapper() const OVERRIDE;
+  virtual content::WebContents* GetSelectedWebContents() const OVERRIDE;
+  virtual TabContentsWrapper* GetTabContentsWrapperAt(int index) const OVERRIDE;
+  virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE;
 
   // Overridden from content::PageNavigator:
   virtual content::WebContents* OpenURL(
       const content::OpenURLParams& params) OVERRIDE;
 
   // Overridden from CommandUpdater::CommandUpdaterDelegate:
   virtual void ExecuteCommand(int id) OVERRIDE;
 
   // Overridden from TabRestoreServiceObserver:
   virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;
@@ skipping 669 matching lines @@
 
   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_