diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 21:57:45 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 21:57:45 +0000 |
commit | c848d3d965724a00356d0bb92ae98505f2853a6c (patch) | |
tree | 5d0c5340cb7e51b5fc3b04d59cb1da5ac31a78f2 /chrome/browser/browser.h | |
parent | 2f9791735a0c7066a261702d85eea393ac1c84cb (diff) | |
download | chromium_src-c848d3d965724a00356d0bb92ae98505f2853a6c.zip chromium_src-c848d3d965724a00356d0bb92ae98505f2853a6c.tar.gz chromium_src-c848d3d965724a00356d0bb92ae98505f2853a6c.tar.bz2 |
Moves TabStripModelObserver/Delegate into their own headers.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3425009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
-rw-r--r-- | chrome/browser/browser.h | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index af9aad1..6b57e25 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -23,7 +23,8 @@ #include "chrome/browser/sessions/tab_restore_service_observer.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/sync/profile_sync_service_observer.h" -#include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/tabs/tab_strip_model_delegate.h" +#include "chrome/browser/tabs/tab_strip_model_observer.h" #include "chrome/browser/tab_contents/match_preview_delegate.h" #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" @@ -44,6 +45,7 @@ class SessionStorageNamespace; class SkBitmap; class StatusBubble; class TabNavigation; +class TabStripModel; namespace gfx { class Point; } @@ -317,26 +319,16 @@ class Browser : public TabStripModelDelegate, // TabStripModel pass-thrus ///////////////////////////////////////////////// TabStripModel* tabstrip_model() const { - return const_cast<TabStripModel*>(&tabstrip_model_); + return const_cast<TabStripModel*>(tabstrip_model_.get()); } - int tab_count() const { return tabstrip_model_.count(); } - int selected_index() const { return tabstrip_model_.selected_index(); } - int GetIndexOfController(const NavigationController* controller) const { - return tabstrip_model_.GetIndexOfController(controller); - } - TabContents* GetTabContentsAt(int index) const { - return tabstrip_model_.GetTabContentsAt(index); - } - TabContents* GetSelectedTabContents() const { - return tabstrip_model_.GetSelectedTabContents(); - } - void SelectTabContentsAt(int index, bool user_gesture) { - tabstrip_model_.SelectTabContentsAt(index, user_gesture); - } - void CloseAllTabs() { - tabstrip_model_.CloseAllTabs(); - } + int tab_count() const; + int selected_index() const; + int GetIndexOfController(const NavigationController* controller) const; + TabContents* GetTabContentsAt(int index) const; + TabContents* GetSelectedTabContents() const; + void SelectTabContentsAt(int index, bool user_gesture); + void CloseAllTabs(); // Tab adding/showing functions ///////////////////////////////////////////// @@ -984,7 +976,7 @@ class Browser : public TabStripModelDelegate, BrowserWindow* window_; // This Browser's TabStripModel. - TabStripModel tabstrip_model_; + scoped_ptr<TabStripModel> tabstrip_model_; // The CommandUpdater that manages the browser window commands. CommandUpdater command_updater_; |