Remove TabContents from TabStripModelObserver::ActiveTabChanged.

chrome/browser/ui/ash/launcher/browser_launcher_item_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/ash/launcher/browser_launcher_item_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 47 matching lines @@
     launcher_controller()->CreateAppLauncherItem(this, app_id(), app_status);
   } else {
     launcher_controller()->CreateTabbedLauncherItem(
         this,
         is_incognito_ ? ChromeLauncherController::STATE_INCOGNITO :
                         ChromeLauncherController::STATE_NOT_INCOGNITO,
         app_status);
   }
   // In testing scenarios we can get tab strips with no active contents.
   if (tab_model_->GetActiveTabContents())
-    UpdateLauncher(tab_model_->GetActiveTabContents());
+    UpdateLauncher(tab_model_->GetActiveWebContents());
 }
 
 // static
 BrowserLauncherItemController* BrowserLauncherItemController::Create(
     Browser* browser) {
   // Under testing this can be called before the controller is created.
   if (!ChromeLauncherController::instance())
     return NULL;
 
   Type type;
@@ skipping 82 matching lines @@
 void BrowserLauncherItemController::LauncherItemChanged(
     int index,
     const ash::LauncherItem& old_item) {
   if (launcher_model()->items()[index].status == ash::STATUS_ACTIVE &&
       old_item.status == ash::STATUS_RUNNING) {
     Activate();
   }
 }
 
 void BrowserLauncherItemController::ActiveTabChanged(
-    TabContents* old_contents,
-    TabContents* new_contents,
+    content::WebContents* old_contents,
+    content::WebContents* new_contents,
     int index,
     bool user_gesture) {
   // Update immediately on a tab change.
   if (old_contents)
-    UpdateAppState(old_contents->web_contents());
-  UpdateAppState(new_contents->web_contents());
+    UpdateAppState(old_contents);
+  UpdateAppState(new_contents);
   UpdateLauncher(new_contents);
 }
 
 void BrowserLauncherItemController::TabInsertedAt(
     content::WebContents* contents,
     int index,
     bool foreground) {
   UpdateAppState(contents);
 }
 
 void BrowserLauncherItemController::TabDetachedAt(
     content::WebContents* contents,
     int index) {
   launcher_controller()->UpdateAppState(
       contents, ChromeLauncherController::APP_STATE_REMOVED);
 }
 
 void BrowserLauncherItemController::TabChangedAt(
     TabContents* tab,
     int index,
     TabStripModelObserver::TabChangeType change_type) {
   UpdateAppState(tab->web_contents());
   if (index != tab_model_->active_index() ||
       !(change_type != TabStripModelObserver::LOADING_ONLY &&
         change_type != TabStripModelObserver::TITLE_NOT_LOADING)) {
     return;
   }
 
-  UpdateLauncher(tab);
+  UpdateLauncher(tab->web_contents());
 }
 
 void BrowserLauncherItemController::TabReplacedAt(
     TabStripModel* tab_strip_model,
     TabContents* old_contents,
     TabContents* new_contents,
     int index) {
   launcher_controller()->UpdateAppState(
       old_contents->web_contents(),
       ChromeLauncherController::APP_STATE_REMOVED);
   UpdateAppState(new_contents->web_contents());
 }
 
 void BrowserLauncherItemController::FaviconUpdated() {
-  UpdateLauncher(tab_model_->GetActiveTabContents());
+  UpdateLauncher(tab_model_->GetActiveWebContents());
 }
 
 void BrowserLauncherItemController::OnWindowPropertyChanged(
     aura::Window* window,
     const void* key,
     intptr_t old) {
   if (key == aura::client::kDrawAttentionKey)
     UpdateItemStatus();
 }
 
 void BrowserLauncherItemController::UpdateItemStatus() {
   ash::LauncherItemStatus status;
   if (ash::wm::IsActiveWindow(window_)) {
     // Clear attention state if active.
     if (window_->GetProperty(aura::client::kDrawAttentionKey))
       window_->SetProperty(aura::client::kDrawAttentionKey, false);
     status = ash::STATUS_ACTIVE;
   } else if (window_->GetProperty(aura::client::kDrawAttentionKey)) {
     status = ash::STATUS_ATTENTION;
   } else {
     status = ash::STATUS_RUNNING;
   }
   launcher_controller()->SetItemStatus(launcher_id(), status);
 }
 
-void BrowserLauncherItemController::UpdateLauncher(TabContents* tab) {
+void BrowserLauncherItemController::UpdateLauncher(content::WebContents* tab) {
   if (type() == TYPE_APP_PANEL)
     return;  // Maintained entirely by ChromeLauncherController.
 
   if (!tab)
     return;  // Assume the window is going to be closed if there are no tabs.
 
   int item_index = launcher_model()->ItemIndexByID(launcher_id());
   if (item_index == -1)
     return;
 
   ash::LauncherItem item = launcher_model()->items()[item_index];
   if (type() == TYPE_EXTENSION_PANEL) {
-    if (!favicon_loader_.get() ||
-        favicon_loader_->web_contents() != tab->web_contents()) {
-      favicon_loader_.reset(
-          new LauncherFaviconLoader(this, tab->web_contents()));
-    }
+    if (!favicon_loader_.get() || favicon_loader_->web_contents() != tab)
+      favicon_loader_.reset(new LauncherFaviconLoader(this, tab));
+
     // Update the icon for extension panels.
     extensions::TabHelper* extensions_tab_helper =
-        extensions::TabHelper::FromWebContents(tab->web_contents());
+        extensions::TabHelper::FromWebContents(tab);
     gfx::ImageSkia new_image = gfx::ImageSkia(favicon_loader_->GetFavicon());
     if (new_image.isNull() && extensions_tab_helper->GetExtensionAppIcon())
       new_image = gfx::ImageSkia(*extensions_tab_helper->GetExtensionAppIcon());
     // Only update the icon if we have a new image, or none has been set yet.
     // This avoids flickering to an empty image when a pinned app is opened.
     if (!new_image.isNull())
       item.image = new_image;
     else if (item.image.isNull())
       item.image = extensions::Extension::GetDefaultIcon(true);
   } else {
     DCHECK_EQ(TYPE_TABBED, type());
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     FaviconTabHelper* favicon_tab_helper =
-        FaviconTabHelper::FromWebContents(tab->web_contents());
+        FaviconTabHelper::FromWebContents(tab);
     if (favicon_tab_helper->ShouldDisplayFavicon()) {
       item.image = favicon_tab_helper->GetFavicon().AsImageSkia();
       if (item.image.isNull()) {
         item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
       }
     } else {
       item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
     }
   }
   launcher_model()->Set(item_index, item);
@@ skipping 11 matching lines @@
       app_state = ChromeLauncherController::APP_STATE_ACTIVE;
   } else {
     app_state = ChromeLauncherController::APP_STATE_INACTIVE;
   }
   launcher_controller()->UpdateAppState(tab, app_state);
 }
 
 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
   return launcher_controller()->model();
 }