| Index: ash/shelf/shelf_alignment_menu.h
|
| diff --git a/ash/launcher/launcher_alignment_menu.h b/ash/shelf/shelf_alignment_menu.h
|
| similarity index 79%
|
| rename from ash/launcher/launcher_alignment_menu.h
|
| rename to ash/shelf/shelf_alignment_menu.h
|
| index f5e551f34cbaaf7bec87b2f49458652e4c09afb6..b213aa0dbcf4b11c3ddb3cd92092453435c8fb28 100644
|
| --- a/ash/launcher/launcher_alignment_menu.h
|
| +++ b/ash/shelf/shelf_alignment_menu.h
|
| @@ -16,11 +16,11 @@ class RootWindow;
|
| namespace ash {
|
|
|
| // Submenu for choosing the alignment of the launcher.
|
| -class ASH_EXPORT LauncherAlignmentMenu : public ui::SimpleMenuModel,
|
| - public ui::SimpleMenuModel::Delegate {
|
| +class ASH_EXPORT ShelfAlignmentMenu : public ui::SimpleMenuModel,
|
| + public ui::SimpleMenuModel::Delegate {
|
| public:
|
| - explicit LauncherAlignmentMenu(aura::RootWindow* root);
|
| - virtual ~LauncherAlignmentMenu();
|
| + explicit ShelfAlignmentMenu(aura::RootWindow* root);
|
| + virtual ~ShelfAlignmentMenu();
|
|
|
| // ui::SimpleMenuModel::Delegate overrides:
|
| virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
|
| @@ -40,7 +40,7 @@ class ASH_EXPORT LauncherAlignmentMenu : public ui::SimpleMenuModel,
|
|
|
| aura::RootWindow* root_window_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(LauncherAlignmentMenu);
|
| + DISALLOW_COPY_AND_ASSIGN(ShelfAlignmentMenu);
|
| };
|
|
|
| } // namespace ash
|
|
|