Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

Issue 2628023002: Fix cannot select and activate pinned v2app through launcher context menu (Closed)
Patch Set: AsAppWindowLauncherItemController Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
}

Powered by Google App Engine
This is Rietveld 408576698