diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-02 17:29:43 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-02 17:29:43 +0000 |
| commit | 8a34e660e7b6627b71a3b24e6800090f239075bb (patch) | |
| tree | e76c3a12d82cd6e6d8dc467596316f0666fd1296 /chrome/browser/cocoa/browser_window_controller.mm | |
| parent | 0b4158e6bc07aea93651c05c3bf26c2152bd9842 (diff) | |
| download | chromium_src-8a34e660e7b6627b71a3b24e6800090f239075bb.zip chromium_src-8a34e660e7b6627b71a3b24e6800090f239075bb.tar.gz chromium_src-8a34e660e7b6627b71a3b24e6800090f239075bb.tar.bz2 | |
Rip out phantom tabs and corresponding unit tests.
Also get rid of the type enum passed to TabReplacedAt since it can only be one option after phantom tabs are removed.
BUG=none
TEST=compile? good. pass tests? good.
Review URL: http://codereview.chromium.org/3539010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller.mm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index d33c0ca..ff95a04 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -407,8 +407,7 @@ // from this method. - (void)windowWillClose:(NSNotification*)notification { DCHECK_EQ([notification object], [self window]); - DCHECK(!browser_->tabstrip_model()->HasNonPhantomTabs() || - !browser_->tabstrip_model()->count()); + DCHECK(browser_->tabstrip_model()->empty()); [savedRegularWindow_ close]; // We delete statusBubble here because we need to kill off the dependency // that its window has on our window before our window goes away. @@ -458,7 +457,7 @@ // have to save the window position before we call orderOut:. [self saveWindowPositionIfNeeded]; - if (browser_->tabstrip_model()->HasNonPhantomTabs()) { + if (!browser_->tabstrip_model()->empty()) { // Tab strip isn't empty. Hide the frame (so it appears to have closed // immediately) and close all the tabs, allowing the renderers to shut // down. When the tab strip is empty we'll be called back again. @@ -1321,12 +1320,12 @@ } - (NSInteger)numberOfTabs { - // count() includes pinned tabs (both live and phantom). + // count() includes pinned tabs. return browser_->tabstrip_model()->count(); } - (BOOL)hasLiveTabs { - return browser_->tabstrip_model()->HasNonPhantomTabs(); + return !browser_->tabstrip_model()->empty(); } - (NSString*)selectedTabTitle { |