| Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
|
| index bd0482a01498714d852ab32bfdc439987ee0bdec..5ed7f75e8194d7ccbdb0598614765fc3ba168ac7 100644
|
| --- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
|
| @@ -65,10 +65,11 @@ bool CanBrowserBeUsedForDirectActivation(Browser* browser,
|
| // static
|
| AppShortcutLauncherItemController* AppShortcutLauncherItemController::Create(
|
| const std::string& app_id,
|
| + const std::string& launch_id,
|
| ChromeLauncherController* controller) {
|
| if (app_id == ArcSupportHost::kHostAppId || app_id == arc::kPlayStoreAppId)
|
| return new ArcPlaystoreShortcutLauncherItemController(controller);
|
| - return new AppShortcutLauncherItemController(app_id, controller);
|
| + return new AppShortcutLauncherItemController(app_id, launch_id, controller);
|
| }
|
|
|
| // Item controller for an app shortcut. Shortcuts track app and launcher ids,
|
| @@ -76,9 +77,12 @@ AppShortcutLauncherItemController* AppShortcutLauncherItemController::Create(
|
| // item with the appropriate LauncherItemController type).
|
| AppShortcutLauncherItemController::AppShortcutLauncherItemController(
|
| const std::string& app_id,
|
| + const std::string& launch_id,
|
| ChromeLauncherController* controller)
|
| - : LauncherItemController(TYPE_SHORTCUT, app_id, controller),
|
| - chrome_launcher_controller_(controller) {
|
| + : LauncherItemController(TYPE_SHORTCUT, app_id, launch_id, controller),
|
| + chrome_launcher_controller_(controller),
|
| + app_id_(app_id),
|
| + launch_id_(launch_id) {
|
| // To detect V1 applications we use their domain and match them against the
|
| // used URL. This will also work with applications like Google Drive.
|
| const Extension* extension =
|
|
|