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

Unified Diff: ash/shelf/shelf_window_watcher_item_delegate.cc

Issue 107163005: [ash] Add TYPE_DIALOG and its item's LauncherContextMenu (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
Index: ash/shelf/shelf_window_watcher_item_delegate.cc
diff --git a/ash/shelf/shelf_window_watcher_item_delegate.cc b/ash/shelf/shelf_window_watcher_item_delegate.cc
index 6c7cc6565dcfda44f1298be9f9b0614ddaaed7b0..99b57c529243b5ec765649c129c898bf920ac743 100644
--- a/ash/shelf/shelf_window_watcher_item_delegate.cc
+++ b/ash/shelf/shelf_window_watcher_item_delegate.cc
@@ -4,6 +4,7 @@
#include "ash/shelf/shelf_window_watcher_item_delegate.h"
+#include "ash/shelf/shelf_item_context_menu.h"
#include "ash/shelf/shelf_util.h"
#include "ash/wm/window_state.h"
#include "ui/aura/window.h"
@@ -47,8 +48,7 @@ base::string16 ShelfWindowWatcherItemDelegate::GetTitle() {
ui::MenuModel* ShelfWindowWatcherItemDelegate::CreateContextMenu(
aura::Window* root_window) {
- // TODO(simonhong): Create ShelfItemContextMenu.
- return NULL;
+ return new ShelfItemContextMenu(this, root_window);
}
ShelfMenuModel* ShelfWindowWatcherItemDelegate::CreateApplicationMenu(

Powered by Google App Engine
This is Rietveld 408576698