Remove TabContents from ui/ash.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 14 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/aura/window_observer.h"
 
 class AppSyncUIState;
 class Browser;
 class BrowserLauncherItemControllerTest;
 class LauncherItemController;
 class Profile;
 class ShellWindowLauncherController;
-class TabContents;
 
 namespace ash {
 class LauncherModel;
 }
 
 namespace aura {
 class Window;
 }
 
 namespace content {
@@ skipping 153 matching lines @@
   // behavior on |root_window|.
   virtual bool CanUserModifyShelfAutoHideBehavior(
       aura::RootWindow* root_window) const OVERRIDE;
 
   // Toggles the shelf auto-hide behavior on |root_window|. Does nothing if the
   // user is not allowed to modify the auto-hide behavior.
   virtual void ToggleShelfAutoHideBehavior(
       aura::RootWindow* root_window) OVERRIDE;
 
   // The tab no longer represents its previously identified application.
-  virtual void RemoveTabFromRunningApp(TabContents* tab,
+  virtual void RemoveTabFromRunningApp(content::WebContents* tab,
                                        const std::string& app_id) OVERRIDE;
 
   // Notify the controller that the state of an non platform app's tabs
   // have changed,
   virtual void UpdateAppState(content::WebContents* contents,
                               AppState app_state) OVERRIDE;
 
   // Limits application refocusing to urls that match |url| for |id|.
   virtual void SetRefocusURLPattern(ash::LauncherID id,
                                     const GURL& url) OVERRIDE;
@@ skipping 49 matching lines @@
   virtual void SetAppTabHelperForTest(AppTabHelper* helper) OVERRIDE;
   virtual void SetAppIconLoaderForTest(AppIconLoader* loader) OVERRIDE;
   virtual const std::string& GetAppIdFromLauncherIdForTest(
       ash::LauncherID id) OVERRIDE;
 
  private:
   friend class ChromeLauncherControllerPerBrowserTest;
 
   typedef std::map<ash::LauncherID, LauncherItemController*>
           IDToItemControllerMap;
-  typedef std::list<TabContents*> TabContentsList;
-  typedef std::map<std::string, TabContentsList> AppIDToTabContentsListMap;
-  typedef std::map<TabContents*, std::string> TabContentsToAppIDMap;
+  typedef std::list<content::WebContents*> WebContentsList;
+  typedef std::map<std::string, WebContentsList> AppIDToWebContentsListMap;
+  typedef std::map<content::WebContents*, std::string> WebContentsToAppIDMap;
 
   // Returns the profile used for new windows.
   Profile* GetProfileForNewWindows();
 
   // Invoked when the associated browser or app is closed.
   void LauncherItemClosed(ash::LauncherID id);
 
   // Internal helpers for pinning and unpinning that handle both
   // client-triggered and internal pinning operations.
   void DoPinAppWithID(const std::string& app_id);
   void DoUnpinAppsWithID(const std::string& app_id);
 
   // Re-syncs launcher model with prefs::kPinnedLauncherApps.
   void UpdateAppLaunchersFromPref();
 
   // Persists the shelf auto-hide behavior to prefs.
   void SetShelfAutoHideBehaviorPrefs(ash::ShelfAutoHideBehavior behavior,
                                      aura::RootWindow* root_window);
 
   // Sets the shelf auto-hide behavior from prefs.
   void SetShelfAutoHideBehaviorFromPrefs();
 
   // Sets the shelf alignment from prefs.
   void SetShelfAlignmentFromPrefs();
 
-  // Returns the most recently active tab contents for an app.
-  TabContents* GetLastActiveTabContents(const std::string& app_id);
+  // Returns the most recently active WebContents for an app.
+  content::WebContents* GetLastActiveWebContents(const std::string& app_id);
 
   // Creates an app launcher to insert at |index|. Note that |index| may be
   // adjusted by the model to meet ordering constraints.
   ash::LauncherID InsertAppLauncherItem(
       LauncherItemController* controller,
       const std::string& app_id,
       ash::LauncherItemStatus status,
       int index);
 
   bool HasItemController(ash::LauncherID id) const;
 
   ash::LauncherModel* model_;
 
   // Profile used for prefs and loading extensions. This is NOT necessarily the
   // profile new windows are created with.
   Profile* profile_;
 
   IDToItemControllerMap id_to_item_controller_map_;
 
-  // Maintains activation order of tab contents for each app.
-  AppIDToTabContentsListMap app_id_to_tab_contents_list_;
+  // Maintains activation order of web contents for each app.
+  AppIDToWebContentsListMap app_id_to_web_contents_list_;
 
-  // Direct access to app_id for a tab contents.
-  TabContentsToAppIDMap tab_contents_to_app_id_;
+  // Direct access to app_id for a web contents.
+  WebContentsToAppIDMap web_contents_to_app_id_;
 
   // Used to track shell windows.
   scoped_ptr<ShellWindowLauncherController> shell_window_controller_;
 
   // Used to get app info for tabs.
   scoped_ptr<AppTabHelper> app_tab_helper_;
 
   // Used to load the image for an app item.
   scoped_ptr<AppIconLoader> app_icon_loader_;
 
   content::NotificationRegistrar notification_registrar_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
   AppSyncUIState* app_sync_ui_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_