Remove TabContents from TabStripModelObserver::ActiveTabChanged.

chrome/browser/ui/browser_instant_controller.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/browser_instant_controller.h"
 
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
 
 // Returns true iff the search model for |tab| is in an NTP state, that is, a
 // state in which the Instant overlay may be showing custom NTP content in
 // EXTENDED mode.
-bool IsSearchModelNTP(TabContents* tab) {
-  if (!tab || !tab->web_contents())
+bool IsSearchModelNTP(content::WebContents* tab) {
+  if (!tab)
     return false;
-  content::WebContents* web_contents = tab->web_contents();
   chrome::search::SearchModel* model =
-      chrome::search::SearchTabHelper::FromWebContents(web_contents)->model();
+      chrome::search::SearchTabHelper::FromWebContents(tab)->model();
   return model && model->mode().is_ntp();
 }
 
 }  // namespace
 
 namespace chrome {
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, public:
 
@@ skipping 80 matching lines @@
     PrefServiceBase* service,
     const std::string& pref_name) {
   DCHECK_EQ(std::string(prefs::kInstantEnabled), pref_name);
   ResetInstant();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, TabStripModelObserver implementation:
 
 void BrowserInstantController::ActiveTabChanged(
-    TabContents* old_contents,
-    TabContents* new_contents,
+    content::WebContents* old_contents,
+    content::WebContents* new_contents,
     int index,
     bool user_gesture) {
   if (instant()) {
     const bool old_is_ntp = IsSearchModelNTP(old_contents);
     const bool new_is_ntp = IsSearchModelNTP(new_contents);
     // Do not hide Instant if switching from an NTP to another NTP since that
     // would cause custom NTP content to flicker.
     if (!(old_is_ntp && new_is_ntp))
       instant()->Hide();
   }
@@ skipping 18 matching lines @@
           InstantController::CreateInstant(browser_->profile(), this) : NULL);
 
   // Notify any observers that they need to reset.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_INSTANT_RESET,
       content::Source<BrowserInstantController>(this),
       content::NotificationService::NoDetails());
 }
 
 }  // namespace chrome