| Index: chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h
|
| diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h
|
| index 6066f68b1c48a1d8e4c0d5b1e41b67b1dd6d08e6..1e0d370faa2f7ab8f850eecf1da51365cbcc5892 100644
|
| --- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h
|
| +++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h
|
| @@ -31,7 +31,6 @@ class BrowserLauncherItemControllerTest;
|
| class PrefService;
|
| class Profile;
|
| class TabContents;
|
| -typedef TabContents TabContentsWrapper;
|
|
|
| // ChromeLauncherController manages the launcher items needed for tabbed
|
| // browsers (BrowserLauncherItemController) and browser shortcuts.
|
| @@ -54,7 +53,7 @@ class ChromeLauncherController : public ash::LauncherDelegate,
|
|
|
| // Returns the app id of the specified tab, or an empty string if there is
|
| // no app.
|
| - virtual std::string GetAppID(TabContentsWrapper* tab) = 0;
|
| + virtual std::string GetAppID(TabContents* tab) = 0;
|
|
|
| // Returns true if |id| is valid. Used during restore to ignore no longer
|
| // valid extensions.
|
| @@ -119,7 +118,7 @@ class ChromeLauncherController : public ash::LauncherDelegate,
|
| ExtensionPrefs::LaunchType GetLaunchType(ash::LauncherID id);
|
|
|
| // Returns the id of the app for the specified tab.
|
| - std::string GetAppID(TabContentsWrapper* tab);
|
| + std::string GetAppID(TabContents* tab);
|
|
|
| // Sets the image for an app tab. This is intended to be invoked from the
|
| // AppIconLoader.
|
|
|