| Index: ash/shell/context_menu.h
|
| diff --git a/ash/shell/context_menu.h b/ash/shell/context_menu.h
|
| index 6c25698c6100df91b5f1fa7a166f81c4ecb15ce1..547ce7c4f2344c6ede603af611212f3480206b64 100644
|
| --- a/ash/shell/context_menu.h
|
| +++ b/ash/shell/context_menu.h
|
| @@ -11,7 +11,7 @@
|
|
|
| namespace ash {
|
|
|
| -class WmShelf;
|
| +class Shelf;
|
|
|
| namespace shell {
|
|
|
| @@ -19,7 +19,7 @@ namespace shell {
|
| class ContextMenu : public ui::SimpleMenuModel,
|
| public ui::SimpleMenuModel::Delegate {
|
| public:
|
| - explicit ContextMenu(WmShelf* wm_shelf);
|
| + explicit ContextMenu(Shelf* shelf);
|
| ~ContextMenu() override;
|
|
|
| // ui::SimpleMenuModel::Delegate overrides:
|
| @@ -33,7 +33,7 @@ class ContextMenu : public ui::SimpleMenuModel,
|
| MENU_ALIGNMENT_MENU,
|
| };
|
|
|
| - WmShelf* wm_shelf_;
|
| + Shelf* shelf_;
|
| ShelfAlignmentMenu alignment_menu_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ContextMenu);
|
|
|