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

Unified Diff: ash/shelf/shelf_view.cc

Issue 58813002: Upon activation on mixed mode, we only show and use apps of the current user. Furthermore we should… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Created 7 years, 1 month 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 | « ash/shelf/app_list_shelf_item_delegate.cc ('k') | ash/shell/window_watcher_launcher_item_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index fcd27ff5dde6efee1480ad14b788d6ecc3621d72..86ddc6ca7e4c5800e7b09a17f1404672e669ad67 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -1672,9 +1672,8 @@ void ShelfView::ButtonPressed(views::Button* sender, const ui::Event& event) {
LauncherItemDelegate* item_delegate =
item_manager_->GetLauncherItemDelegate(
model_->items()[view_index].id);
- item_delegate->ItemSelected(event);
-
- ShowListMenuForView(model_->items()[view_index], sender, event);
+ if (!item_delegate->ItemSelected(event))
+ ShowListMenuForView(model_->items()[view_index], sender, event);
}
}
« no previous file with comments | « ash/shelf/app_list_shelf_item_delegate.cc ('k') | ash/shell/window_watcher_launcher_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698