Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Unified Diff: chrome/browser/cocoa/tab_strip_controller.mm

Issue 2821011: Removes phantom tabs. (Closed)
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/tab_controller.mm ('k') | chrome/browser/cocoa/tab_strip_model_observer_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/tab_strip_controller.mm
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 6bf651d730c8a637e72f9ac5490990a01a1a809f..f1b272053d64a3b5061bbf4f92a2f9bd330c79e6 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -941,10 +941,6 @@ private:
[oldController willBecomeUnselectedTab];
oldContents->view()->StoreFocus();
oldContents->WasHidden();
- // If the selection changed because the tab was made phantom, update the
- // Cocoa side of the state.
- TabController* tabController = [tabArray_ objectAtIndex:oldIndex];
- [tabController setPhantom:tabStripModel_->IsPhantomTab(oldModelIndex)];
}
}
@@ -1131,12 +1127,6 @@ private:
TabController* tabController = [tabArray_ objectAtIndex:index];
- // Since the tab is loading, it cannot be phantom any more.
- if ([tabController phantom]) {
- [tabController setPhantom:NO];
- [[tabController view] setNeedsDisplay:YES];
- }
-
bool oldHasIcon = [tabController iconView] != nil;
bool newHasIcon = contents->ShouldDisplayFavIcon() ||
tabStripModel_->IsMiniTab(modelIndex); // Always show icon if mini.
@@ -1205,11 +1195,6 @@ private:
if (change != TabStripModelObserver::LOADING_ONLY)
[self setTabTitle:tabController withContents:contents];
- // See if the change was to/from phantom.
- bool isPhantom = tabStripModel_->IsPhantomTab(modelIndex);
- if (isPhantom != [tabController phantom])
- [tabController setPhantom:isPhantom];
-
[self updateFavIconForContents:contents atIndex:modelIndex];
TabContentsController* updatedController =
« no previous file with comments | « chrome/browser/cocoa/tab_controller.mm ('k') | chrome/browser/cocoa/tab_strip_model_observer_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698