Remove TabContents from ui/ash.

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"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/widget/widget.h"
 
 using extensions::Extension;
@@ skipping 28 matching lines @@
   if (type() != TYPE_TABBED) {
     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())
+  if (tab_model_->active_index() != TabStripModel::kNoTab)
     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;
 
@@ skipping 26 matching lines @@
 
 void BrowserLauncherItemController::BrowserActivationStateChanged() {
   content::WebContents* active_contents = tab_model_->GetActiveWebContents();
   if (active_contents)
     UpdateAppState(active_contents);
   UpdateItemStatus();
 }
 
 string16 BrowserLauncherItemController::GetTitle() {
   if (type() == TYPE_TABBED || type() == TYPE_EXTENSION_PANEL) {
-    if (tab_model_->GetActiveTabContents()) {
-      const content::WebContents* contents =
-          tab_model_->GetActiveTabContents()->web_contents();
+    if (tab_model_->active_index() != TabStripModel::kNoTab) {
+      const content::WebContents* contents = tab_model_->GetActiveWebContents();
       if (contents)
         return contents->GetTitle();
     }
   }
   return GetAppTitle();
 }
 
 bool BrowserLauncherItemController::HasWindow(aura::Window* window) const {
   return window_ == window;
 }
@@ skipping 175 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();
 }