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

Unified Diff: chrome/browser/ui/tabs/tab_strip_model.cc

Issue 11434091: Remove various TabContents use from TabStripModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/ui/tabs/tab_strip_model.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698