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

Unified Diff: ash/shell/context_menu.h

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content Created 4 years, 6 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 | « ash/shelf/shelf_widget.cc ('k') | ash/shell/context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/context_menu.h
diff --git a/ash/shell/context_menu.h b/ash/shell/context_menu.h
index b604884f56d9d845e61e81d2bbbcea7b7c769355..9c59e7e74efea11545c4f6a8888e4d13ecf25b68 100644
--- a/ash/shell/context_menu.h
+++ b/ash/shell/context_menu.h
@@ -11,7 +11,7 @@
namespace ash {
-class Shelf;
+class WmShelf;
namespace shell {
@@ -19,7 +19,7 @@ namespace shell {
class ContextMenu : public ui::SimpleMenuModel,
public ui::SimpleMenuModel::Delegate {
public:
- explicit ContextMenu(Shelf* shelf);
+ explicit ContextMenu(WmShelf* wm_shelf);
~ContextMenu() override;
// ui::SimpleMenuModel::Delegate overrides:
@@ -35,7 +35,7 @@ class ContextMenu : public ui::SimpleMenuModel,
MENU_ALIGNMENT_MENU,
};
- Shelf* shelf_;
+ WmShelf* wm_shelf_;
ShelfAlignmentMenu alignment_menu_;
DISALLOW_COPY_AND_ASSIGN(ContextMenu);
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/shell/context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698