Remove TabContents from TabStripModelObserver::ActiveTabChanged.

chrome/browser/ui/bookmarks/bookmark_prompt_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/bookmarks/bookmark_prompt_controller.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 145 matching lines @@
 // static
 void BookmarkPromptController::DisableBookmarkPrompt(
     PrefServiceBase* prefs) {
   UMA_HISTOGRAM_ENUMERATION("BookmarkPrompt.DisabledReason",
                             PROMPT_DISABLED_REASON_BY_MANUAL,
                             PROMPT_DISABLED_REASON_LIMIT);
   BookmarkPromptPrefs prompt_prefs(prefs);
   prompt_prefs.DisableBookmarkPrompt();
 }
 
-void BookmarkPromptController::ActiveTabChanged(TabContents*,
-                                                TabContents* new_contents,
-                                                int, bool) {
+void BookmarkPromptController::ActiveTabChanged(WebContents* old_contents,
+                                                WebContents* new_contents,
+                                                int index,
+                                                bool user_gesture) {
   SetWebContents(new_contents);
 }
 
 void BookmarkPromptController::AddedBookmarkInternal(Browser* browser,
                                                      const GURL& url) {
   if (browser == browser_ && url == last_prompted_url_) {
     last_prompted_url_ = GURL::EmptyGURL();
     UMA_HISTOGRAM_TIMES("BookmarkPrompt.AddedBookmark",
                         base::Time::Now() - last_prompted_time_);
   }
@@ skipping 90 matching lines @@
 }
 
 void BookmarkPromptController::SetBrowser(Browser* browser) {
   if (browser_ == browser)
     return;
   if (browser_)
     browser_->tab_strip_model()->RemoveObserver(this);
   browser_ = browser;
   if (browser_)
     browser_->tab_strip_model()->AddObserver(this);
-  SetWebContents(browser_ ? chrome::GetActiveTabContents(browser_) : NULL);
+  SetWebContents(browser_ ? chrome::GetActiveWebContents(browser_) : NULL);
 }
 
-void BookmarkPromptController::SetWebContents(TabContents* tab_contents) {
-  WebContents* web_contents =
-      tab_contents ? tab_contents->web_contents() : NULL;
+void BookmarkPromptController::SetWebContents(WebContents* web_contents) {
   if (web_contents_) {
     last_prompted_url_ = GURL::EmptyGURL();
     query_url_consumer_.CancelAllRequests();
     registrar_.Remove(
         this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
         content::Source<WebContents>(web_contents_));
   }
   web_contents_ = web_contents;
   if (web_contents_) {
     registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                    content::Source<WebContents>(web_contents_));
   }
 }