| Index: ash/wm/workspace_controller.h
|
| diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
|
| index b1c1f24746c9420a2e8667b1f1398cb0bf807dd1..b95ca21dd441c40a5e46f8e7c606bf35a00c0207 100644
|
| --- a/ash/wm/workspace_controller.h
|
| +++ b/ash/wm/workspace_controller.h
|
| @@ -10,22 +10,11 @@
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ui/aura/window_observer.h"
|
| -#include "ui/base/models/simple_menu_model.h"
|
|
|
| namespace aura {
|
| class Window;
|
| }
|
|
|
| -namespace gfx {
|
| -class Point;
|
| -class Size;
|
| -}
|
| -
|
| -namespace views {
|
| -class MenuRunner;
|
| -class Widget;
|
| -}
|
| -
|
| namespace ash {
|
| namespace internal {
|
|
|
| @@ -38,8 +27,7 @@ class WorkspaceManager;
|
| // various workspace pieces: WorkspaceManager, WorkspaceLayoutManager and
|
| // WorkspaceEventFilter.
|
| class ASH_EXPORT WorkspaceController :
|
| - public aura::WindowObserver,
|
| - public ui::SimpleMenuModel::Delegate {
|
| + public aura::WindowObserver {
|
| public:
|
| explicit WorkspaceController(aura::Window* viewport);
|
| virtual ~WorkspaceController();
|
| @@ -51,9 +39,6 @@ class ASH_EXPORT WorkspaceController :
|
| return workspace_manager_.get();
|
| }
|
|
|
| - // Shows the menu allowing you to configure various aspects of workspaces.
|
| - void ShowMenu(views::Widget* widget, const gfx::Point& location);
|
| -
|
| // Sets the size of the grid.
|
| void SetGridSize(int grid_size);
|
|
|
| @@ -62,21 +47,9 @@ class ASH_EXPORT WorkspaceController :
|
| const void* key,
|
| intptr_t old) OVERRIDE;
|
|
|
| - // ui::SimpleMenuModel::Delegate overrides:
|
| - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
|
| - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
|
| - virtual void ExecuteCommand(int command_id) OVERRIDE;
|
| - virtual bool GetAcceleratorForCommandId(
|
| - int command_id,
|
| - ui::Accelerator* accelerator) OVERRIDE;
|
| -
|
| private:
|
| friend class WorkspaceControllerTestHelper;
|
|
|
| - enum MenuItem {
|
| - MENU_CHANGE_WALLPAPER,
|
| - };
|
| -
|
| aura::Window* viewport_;
|
|
|
| scoped_ptr<WorkspaceManager> workspace_manager_;
|
| @@ -87,10 +60,6 @@ class ASH_EXPORT WorkspaceController :
|
| // Owned by |viewport_|.
|
| WorkspaceEventFilter* event_filter_;
|
|
|
| -#if !defined(OS_MACOSX)
|
| - scoped_ptr<views::MenuRunner> menu_runner_;
|
| -#endif
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
|
| };
|
|
|
|
|