Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc |
index a010ecdcd5a7ca9744be60823eee201487a59a6e..e731a9ac7741a9a50bb18d59fd0e33aa78234886 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc |
@@ -649,10 +649,12 @@ ChromeLauncherControllerImpl::GetV1ApplicationsFromAppId( |
void ChromeLauncherControllerImpl::ActivateShellApp(const std::string& app_id, |
int window_index) { |
const ash::ShelfItem* item = GetItem(GetShelfIDForAppID(app_id)); |
- if (item && item->type == ash::TYPE_APP) { |
+ if (item && |
+ (item->type == ash::TYPE_APP || item->type == ash::TYPE_APP_SHORTCUT)) { |
LauncherItemController* controller = GetLauncherItemController(item->id); |
AppWindowLauncherItemController* app_window_controller = |
- static_cast<AppWindowLauncherItemController*>(controller); |
+ controller->AsAppWindowLauncherItemController(); |
+ DCHECK(app_window_controller); |
app_window_controller->ActivateIndexedApp(window_index); |
} |
} |