Remove TabContents from TabStripModelObserver::ActiveTabChanged.

chrome/browser/ui/tabs/tab_strip_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 174 matching lines @@
   contents_data_[index]->contents = new_contents->web_contents();
 
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                     TabReplacedAt(this, old_contents, new_contents, index));
 
   // When the active tab contents is replaced send out a selection notification
   // too. We do this as nearly all observers need to treat a replacement of the
   // selected contents as the selection changing.
   if (active_index() == index) {
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
-                      ActiveTabChanged(old_contents, new_contents,
+                      ActiveTabChanged(old_contents->web_contents(),
+                                       new_contents->web_contents(),
                                        active_index(), false));
   }
   return old_contents;
 }
 
 TabContents* TabStripModel::DiscardTabContentsAt(int index) {
   DCHECK(ContainsIndex(index));
   // Do not discard active tab.
   if (active_index() == index)
     return NULL;
@@ skipping 51 matching lines @@
       if (!selection_model_.empty()) {
         // The active tab was removed, but there is still something selected.
         // Move the active and anchor to the first selected index.
         selection_model_.set_active(selection_model_.selected_indices()[0]);
         selection_model_.set_anchor(selection_model_.active());
       } else {
         // The active tab was removed and nothing is selected. Reset the
         // selection and send out notification.
         selection_model_.SetSelectedIndex(next_selected_index);
       }
-      NotifyIfActiveTabChanged(removed_contents, NOTIFY_DEFAULT);
+      NotifyIfActiveTabChanged(removed_contents->web_contents(),
+                               NOTIFY_DEFAULT);
     }
 
     // Sending notification in case the detached tab was selected. Using
     // NotifyIfActiveOrSelectionChanged() here would not guarantee that a
     // notification is sent even though the tab selection has changed because
     // |old_model| is stored after calling DecrementFrom().
     if (was_selected) {
       FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                         TabSelectionChanged(this, old_model));
     }
@@ skipping 200 matching lines @@
     // tab to do a quick look-up of something while viewing a tab earlier in
     // the strip). We can make this heuristic more permissive if need be.
     if (!IsNewTabAtEndOfTabStrip(contents)) {
       // If the user navigates the current tab to another page in any way
       // other than by clicking a link, we want to pro-actively forget all
       // TabStrip opener relationships since we assume they're beginning a
       // different task by reusing the current tab.
       ForgetAllOpeners();
       // In this specific case we also want to reset the group relationship,
       // since it is now technically invalid.
-      ForgetGroup(contents);
+      ForgetGroup(contents->web_contents());
     }
   }
 }
 
 void TabStripModel::ForgetAllOpeners() {
   // Forget all opener memories so we don't do anything weird with tab
   // re-selection ordering.
   for (WebContentsDataVector::const_iterator iter = contents_data_.begin();
        iter != contents_data_.end(); ++iter)
     (*iter)->ForgetOpener();
 }
 
-void TabStripModel::ForgetGroup(TabContents* contents) {
-  int index = GetIndexOfTabContents(contents);
+void TabStripModel::ForgetGroup(WebContents* contents) {
+  int index = GetIndexOfWebContents(contents);
   DCHECK(ContainsIndex(index));
   contents_data_[index]->SetGroup(NULL);
   contents_data_[index]->ForgetOpener();
 }
 
-bool TabStripModel::ShouldResetGroupOnSelect(TabContents* contents) const {
-  int index = GetIndexOfTabContents(contents);
+bool TabStripModel::ShouldResetGroupOnSelect(WebContents* contents) const {
+  int index = GetIndexOfWebContents(contents);
   DCHECK(ContainsIndex(index));
   return contents_data_[index]->reset_group_on_select;
 }
 
 void TabStripModel::SetTabBlocked(int index, bool blocked) {
   DCHECK(ContainsIndex(index));
   if (contents_data_[index]->blocked == blocked)
     return;
   contents_data_[index]->blocked = blocked;
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
@@ skipping 660 matching lines @@
   return contents_data_[index]->contents;
 }
 
 void TabStripModel::NotifyIfTabDeactivated(WebContents* contents) {
   if (contents) {
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                       TabDeactivated(contents));
   }
 }
 
-void TabStripModel::NotifyIfActiveTabChanged(TabContents* old_contents,
+void TabStripModel::NotifyIfActiveTabChanged(WebContents* old_contents,
                                              NotifyTypes notify_types) {
-  TabContents* new_contents = GetTabContentsAtImpl(active_index());
+  WebContents* new_contents = GetWebContentsAtImpl(active_index());
   if (old_contents != new_contents) {
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                       ActiveTabChanged(old_contents, new_contents,
                                        active_index(),
                                        notify_types == NOTIFY_USER_GESTURE));
     // Activating a discarded tab reloads it, so it is no longer discarded.
     contents_data_[active_index()]->discarded = false;
   }
 }
 
 void TabStripModel::NotifyIfActiveOrSelectionChanged(
     TabContents* old_contents,
     NotifyTypes notify_types,
     const TabStripSelectionModel& old_model) {
-  NotifyIfActiveTabChanged(old_contents, notify_types);
+  NotifyIfActiveTabChanged(old_contents ? old_contents->web_contents() : NULL,
+                           notify_types);
 
   if (!selection_model().Equals(old_model)) {
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                       TabSelectionChanged(this, old_model));
   }
 }
 
 void TabStripModel::SetSelection(
     const TabStripSelectionModel& new_model,
     NotifyTypes notify_types) {
@@ skipping 83 matching lines @@
 void TabStripModel::ForgetOpenersAndGroupsReferencing(
     const WebContents* tab) {
   for (WebContentsDataVector::const_iterator i = contents_data_.begin();
        i != contents_data_.end(); ++i) {
     if ((*i)->group == tab)
       (*i)->group = NULL;
     if ((*i)->opener == tab)
       (*i)->opener = NULL;
   }
 }