diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 15:05:10 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 15:05:10 +0000 |
| commit | b9c505bc4409b403aab2c67f016fbe4b01ad1509 (patch) | |
| tree | 53a8b85ad11418306336d88dab1c42402b47bfd8 /chrome/browser/browser.h | |
| parent | 298883bc55dec7bbcb59897b919d9e07691d0da9 (diff) | |
| download | chromium_src-b9c505bc4409b403aab2c67f016fbe4b01ad1509.zip chromium_src-b9c505bc4409b403aab2c67f016fbe4b01ad1509.tar.gz chromium_src-b9c505bc4409b403aab2c67f016fbe4b01ad1509.tar.bz2 | |
Attempt 2 at relanding your patch. I believe the problem was the removal of the observer in ~TabStrip. By the time TabStrip's destructor was run the model's destructor had already run. I've changed BrowserView to explicitly delete the TabStrip before the browser. See the change between v1 and v2 of this patch in BrowserView for the relevant part.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/1817001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index dfd89f1..65eb214 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -623,6 +623,8 @@ class Browser : public TabStripModelDelegate, virtual bool CanCloseContentsAt(int index); virtual bool CanBookmarkAllTabs() const; virtual void BookmarkAllTabs(); + virtual bool UseVerticalTabs() const; + virtual void ToggleUseVerticalTabs(); // Overridden from TabStripModelObserver: virtual void TabInsertedAt(TabContents* contents, @@ -984,6 +986,9 @@ class Browser : public TabStripModelDelegate, // The extension app associated with this window, if any. Extension* extension_app_; + // Tracks the display mode of the tabstrip. + mutable BooleanPrefMember use_vertical_tabs_; + DISALLOW_COPY_AND_ASSIGN(Browser); }; |