Refactor the menu model to live outside views/ so it can be shared

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/465005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33827 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 9 insertions, 6 deletions

diff --git a/views/widget/widget.h b/views/widget/widget.h
index 38a6703..8de4b6c 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -15,9 +15,12 @@ class Point;
 class Rect;
 }
 
+namespace menus {
+class Accelerator;
+}
+
 namespace views {
 
-class Accelerator;
 class FocusManager;
 class RootView;
 class TooltipManager;
@@ -155,7 +158,7 @@ class Widget {
   // Returns the accelerator given a command id. Returns false if there is
   // no accelerator associated with a given id, which is a common condition.
   virtual bool GetAccelerator(int cmd_id,
-                              Accelerator* accelerator) = 0;
+                              menus::Accelerator* accelerator) = 0;
 
   // Returns the Window containing this Widget, or NULL if not contained in a
   // window.
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 02e7ae7..4cb54a5 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -519,7 +519,7 @@ TooltipManager* WidgetGtk::GetTooltipManager() {
   return tooltip_manager_.get();
 }
 
-bool WidgetGtk::GetAccelerator(int cmd_id, Accelerator* accelerator) {
+bool WidgetGtk::GetAccelerator(int cmd_id, menus::Accelerator* accelerator) {
   NOTIMPLEMENTED();
   return false;
 }
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index eab01c4..e748945 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -152,7 +152,7 @@ class WidgetGtk
   virtual void GenerateMousePressedForView(View* view,
                                            const gfx::Point& point);
   virtual TooltipManager* GetTooltipManager();
-  virtual bool GetAccelerator(int cmd_id, Accelerator* accelerator);
+  virtual bool GetAccelerator(int cmd_id, menus::Accelerator* accelerator);
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
   virtual void SetNativeWindowProperty(const std::wstring& name,
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 892d47f..a2075c1 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -320,7 +320,7 @@ void WidgetWin::GenerateMousePressedForView(View* view,
   ProcessMousePressed(point_in_widget.ToPOINT(), MK_LBUTTON, false, false);
 }
 
-bool WidgetWin::GetAccelerator(int cmd_id, Accelerator* accelerator) {
+bool WidgetWin::GetAccelerator(int cmd_id, menus::Accelerator* accelerator) {
   return false;
 }
 
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 43c4357..28a3782 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -196,7 +196,7 @@ class WidgetWin : public app::WindowImpl,
   virtual TooltipManager* GetTooltipManager();
   virtual void GenerateMousePressedForView(View* view,
                                            const gfx::Point& point);
-  virtual bool GetAccelerator(int cmd_id, Accelerator* accelerator);
+  virtual bool GetAccelerator(int cmd_id, menus::Accelerator* accelerator);
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
   virtual void SetNativeWindowProperty(const std::wstring& name,