| 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 =
|
|
|