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

Unified Diff: ash/shelf/shelf_view.cc

Issue 119643002: [ash] Create applist button's context menu in its ShelfItemDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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') | no next file » | 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 01dfae45b02fa19faa5b3c9fbc736b5f84410d6e..b339c2c8b1a98432342a2e6f4a77687930c035ca 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -1827,16 +1827,11 @@ void ShelfView::ShowContextMenuForView(views::View* source,
const gfx::Point& point,
ui::MenuSourceType source_type) {
int view_index = view_model_->GetIndexOfView(source);
- // TODO(simon.hong81): Create LauncherContextMenu for applist in its
- // ShelfItemDelegate.
- if (view_index != -1 && model_->items()[view_index].type == TYPE_APP_LIST) {
- view_index = -1;
- }
-
if (view_index == -1) {
Shell::GetInstance()->ShowContextMenu(point, source_type);
return;
}
+
scoped_ptr<ui::MenuModel> menu_model;
ShelfItemDelegate* item_delegate = item_manager_->GetShelfItemDelegate(
model_->items()[view_index].id);
« no previous file with comments | « ash/shelf/app_list_shelf_item_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698