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

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: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 045b01a9d2877720e16dcade1608d86a6c64e609..5a7096e3693c165565324fd48ebe6fa7685422e6 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -647,7 +647,8 @@ 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);
msw 2017/01/11 20:01:55 It is really safe to static-cast the controller fo
Qiang(Joe) Xu 2017/01/11 21:09:14 ok thanks, let me first bisect to check why it bec
msw 2017/01/11 21:54:44 Your current change seems correct, albeit lacking
Qiang(Joe) Xu 2017/01/11 22:34:21 <<<<<<<<<<<<<<<<Thanks for this info.
msw 2017/01/11 22:52:26 On 2017/01/11 22:34:21, Qiang(Joe) Xu wrote: < Sin
James Cook 2017/01/11 22:55:24 Can you add some documentation in the code explain
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698