Index: chrome/browser/ui/tabs/tab_strip_model.cc |
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc |
index 264fcf5fdbd8117112c93e7be46bdbd37a8fcea0..9b648e384460c756d4af9d0d3a39aee51dd4ea07 100644 |
--- a/chrome/browser/ui/tabs/tab_strip_model.cc |
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc |
@@ -1139,11 +1139,10 @@ void TabStripModel::NotifyIfActiveTabChanged(WebContents* old_contents, |
} |
void TabStripModel::NotifyIfActiveOrSelectionChanged( |
- TabContents* old_contents, |
+ WebContents* old_contents, |
NotifyTypes notify_types, |
const TabStripSelectionModel& old_model) { |
- NotifyIfActiveTabChanged(old_contents ? old_contents->web_contents() : NULL, |
- notify_types); |
+ NotifyIfActiveTabChanged(old_contents, notify_types); |
if (!selection_model().Equals(old_model)) { |
FOR_EACH_OBSERVER(TabStripModelObserver, observers_, |
@@ -1154,11 +1153,11 @@ void TabStripModel::NotifyIfActiveOrSelectionChanged( |
void TabStripModel::SetSelection( |
const TabStripSelectionModel& new_model, |
NotifyTypes notify_types) { |
- TabContents* old_contents = GetActiveTabContents(); |
+ WebContents* old_contents = GetActiveWebContents(); |
TabStripSelectionModel old_model; |
old_model.Copy(selection_model_); |
if (new_model.active() != selection_model_.active()) |
- NotifyIfTabDeactivated(old_contents ? old_contents->web_contents() : NULL); |
+ NotifyIfTabDeactivated(old_contents); |
selection_model_.Copy(new_model); |
NotifyIfActiveOrSelectionChanged(old_contents, notify_types, old_model); |
} |