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

Unified Diff: ash/wm/workspace_controller.h

Issue 9960024: Remove "set wallpaper..." option in system context menu when guest logged in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: IsLoggedInAsGuest => CanOpenSetWallpaperPage Created 8 years, 8 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_context_menu.cc ('k') | ash/wm/workspace_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ash/shell_context_menu.cc ('k') | ash/wm/workspace_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698