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

ui/views/controls/menu/menu_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_runner.h"
 
 #include <set>
 
 #include "base/memory/weak_ptr.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_controller_delegate.h"
 #include "ui/views/controls/menu/menu_delegate.h"
+#include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner_handler.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif
 
 namespace views {
 
@@ skipping 11 matching lines @@
 
   bool running() const { return running_; }
 
   // See description above class for details.
   void Release();
 
   // Runs the menu.
   MenuRunner::RunResult RunMenuAt(Widget* parent,
                                   MenuButton* button,
                                   const gfx::Rect& bounds,
-                                  MenuItemView::AnchorPosition anchor,
+                                  ui::MenuAnchorPosition anchor,
                                   int32 types) WARN_UNUSED_RESULT;
 
   void Cancel();
 
   // Returns the time from the event which closed the menu - or 0.
   base::TimeDelta closing_event_time() const;
 
   // MenuControllerDelegate:
   virtual void DropMenuClosed(NotifyType type, MenuItemView* menu) OVERRIDE;
   virtual void SiblingMenuCreated(MenuItemView* menu) OVERRIDE;
@@ skipping 233 matching lines @@
 }
 
 MenuRunner::~MenuRunner() {
   holder_->Release();
 }
 
 MenuItemView* MenuRunner::GetMenu() {
   return holder_->menu();
 }
 
+template<>
 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent,
                                             MenuButton* button,
                                             const gfx::Rect& bounds,
-                                            MenuItemView::AnchorPosition anchor,
+                                            ui::MenuAnchorPosition menu_anchor,
                                             ui::MenuSourceType source_type,
                                             int32 types) {
+  MenuItemView::AnchorPosition anchor =
+      static_cast<MenuItemView::AnchorPosition>(menu_anchor);
   if (runner_handler_.get()) {
     return runner_handler_->RunMenuAt(parent, button, bounds, anchor,
                                       source_type, types);
   }
 
   // The parent of the nested menu will have created a DisplayChangeListener, so
   // we avoid creating a DisplayChangeListener if nested. Drop menus are
   // transient, so we don't cancel in that case.
   if ((types & (IS_NESTED | FOR_DROP)) == 0 && parent) {
     display_change_listener_.reset(
@@ skipping 30 matching lines @@
 base::TimeDelta MenuRunner::closing_event_time() const {
   return holder_->closing_event_time();
 }
 
 void MenuRunner::SetRunnerHandler(
     scoped_ptr<MenuRunnerHandler> runner_handler) {
   runner_handler_ = runner_handler.Pass();
 }
 
 }  // namespace views