Chromium Code Reviews| Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h |
| diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h |
| index 586a2dc4adf786d57c06efb6ebcbeae36481b94f..3050288d53eb85d6061ac3f27ee11d7fc2686844 100644 |
| --- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h |
| +++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h |
| @@ -50,7 +50,8 @@ class BrowserLauncherItemController : public LauncherItemController, |
| aura::Window* window, |
| TabStripModel* tab_model, |
| ChromeLauncherController* launcher_controller, |
| - const std::string& app_id); |
| + const std::string& app_id, |
| + const std::string& v1_app_id); |
| virtual ~BrowserLauncherItemController(); |
| // Sets up this BrowserLauncherItemController. |
| @@ -133,6 +134,10 @@ class BrowserLauncherItemController : public LauncherItemController, |
| // Browser window we're in. |
| aura::Window* window_; |
| + // If running a windowed V1 app with the new launcher, the app id needs to be |
| + // remembered since an icon needs to be created/destroyed if not pinned. |
| + std::string v1_app_id_; |
|
sky
2013/02/19 17:55:56
Do we really need app_id and v1_app_id? Don't we k
Mr4D (OOO till 08-26)
2013/02/19 19:22:13
Addressed as discussed.
|
| + |
| TabStripModel* tab_model_; |
| // Whether this is associated with an incognito profile. |