[stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid

ui/views/controls/menu/menu_runner.h

Index: ui/views/controls/menu/menu_runner.h
diff --git a/ui/views/controls/menu/menu_runner.h b/ui/views/controls/menu/menu_runner.h
index 6b46362f18e76431451d4a786190e05a6b69be7a..c40e704a7f4f80f782591f92a29a3ce4b6d1c599 100644
--- a/ui/views/controls/menu/menu_runner.h
+++ b/ui/views/controls/menu/menu_runner.h
@@ -8,7 +8,17 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/views/controls/menu/menu_item_view.h"
+#include "ui/base/models/menu_separator_types.h"
+#include "ui/base/ui_base_types.h"
+#include "ui/views/views_export.h"
+
+namespace base {
+class TimeDelta;
+}
+
+namespace gfx {
+class Rect;
+}
 
 namespace ui {
 class MenuModel;
@@ -17,6 +27,7 @@ class MenuModel;
 namespace views {
 
 class MenuButton;
+class MenuItemView;
 class MenuModelAdapter;
 class MenuRunnerHandler;
 class Widget;
@@ -100,10 +111,11 @@ class VIEWS_EXPORT MenuRunner {
   // MENU_DELETED.
   // If |anchor| uses a |BUBBLE_..| type, the bounds will get determined by
   // using |bounds| as the thing to point at in screen coordinates.
+  template <class MENU_ANCHOR_TYPE>
   RunResult RunMenuAt(Widget* parent,
                       MenuButton* button,
                       const gfx::Rect& bounds,
-                      MenuItemView::AnchorPosition anchor,
+                      MENU_ANCHOR_TYPE anchor,
                       ui::MenuSourceType source_type,
                       int32 types) WARN_UNUSED_RESULT;
 
@@ -135,6 +147,14 @@ class VIEWS_EXPORT MenuRunner {
   DISALLOW_COPY_AND_ASSIGN(MenuRunner);
 };
 
+template<> VIEWS_EXPORT
+MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent,
+                                            MenuButton* button,
+                                            const gfx::Rect& bounds,
+                                            ui::MenuAnchorPosition anchor,
+                                            ui::MenuSourceType source_type,
+                                            int32 types) WARN_UNUSED_RESULT;
+
 namespace internal {
 
 // DisplayChangeListener is intended to listen for changes in the display size