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

Unified Diff: ash/sysui/context_menu_mus.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/shell_delegate.h ('k') | ash/sysui/context_menu_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/context_menu_mus.h
diff --git a/ash/sysui/context_menu_mus.h b/ash/sysui/context_menu_mus.h
index bd41702e48fd91425cd9cf6190e741806961cc63..38b864f68011cace61aef4a4a89841340af6f9e2 100644
--- a/ash/sysui/context_menu_mus.h
+++ b/ash/sysui/context_menu_mus.h
@@ -11,14 +11,14 @@
namespace ash {
-class Shelf;
+class WmShelf;
// Context menu for mash.
// TODO(msw): Mimic logic in LauncherContextMenu.
class ContextMenuMus : public ui::SimpleMenuModel,
public ui::SimpleMenuModel::Delegate {
public:
- explicit ContextMenuMus(Shelf* shelf);
+ explicit ContextMenuMus(WmShelf* wm_shelf);
~ContextMenuMus() override;
// ui::SimpleMenuModel::Delegate overrides:
@@ -35,7 +35,7 @@ class ContextMenuMus : public ui::SimpleMenuModel,
MENU_CHANGE_WALLPAPER,
};
- Shelf* shelf_;
+ WmShelf* wm_shelf_;
ShelfAlignmentMenu alignment_menu_;
DISALLOW_COPY_AND_ASSIGN(ContextMenuMus);
« no previous file with comments | « ash/shell_delegate.h ('k') | ash/sysui/context_menu_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698