Move enum MenuAnchorPosition to reduce deps on menu_item_view.h

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,
+                                  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 76 matching lines @@
     DCHECK(controller_);
     // Release is invoked when MenuRunner is destroyed. Assume this is happening
     // because the object referencing the menu has been destroyed and the menu
     // button is no longer valid.
     controller_->Cancel(MenuController::EXIT_DESTROYED);
   } else {
     delete this;
   }
 }
 
-MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(
-    Widget* parent,
-    MenuButton* button,
-    const gfx::Rect& bounds,
-    MenuItemView::AnchorPosition anchor,
-    int32 types) {
+MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(Widget* parent,
+                                                MenuButton* button,
+                                                const gfx::Rect& bounds,
+                                                MenuAnchorPosition anchor,
+                                                int32 types) {
   closing_event_time_ = base::TimeDelta();
   if (running_) {
     // Ignore requests to show the menu while it's already showing. MenuItemView
     // doesn't handle this very well (meaning it crashes).
     return MenuRunner::NORMAL_EXIT;
   }
 
   MenuController* controller = MenuController::GetActiveInstance();
   if (controller) {
     if ((types & MenuRunner::IS_NESTED) != 0) {
@@ skipping 134 matching lines @@
   holder_->Release();
 }
 
 MenuItemView* MenuRunner::GetMenu() {
   return holder_->menu();
 }
 
 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent,
                                             MenuButton* button,
                                             const gfx::Rect& bounds,
-                                            MenuItemView::AnchorPosition anchor,
+                                            MenuAnchorPosition anchor,
                                             ui::MenuSourceType source_type,
                                             int32 types) {
   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(
         internal::DisplayChangeListener::Create(parent, this));
   }
 
   if (types & CONTEXT_MENU) {
     switch (source_type) {
       case ui::MENU_SOURCE_NONE:
       case ui::MENU_SOURCE_KEYBOARD:
       case ui::MENU_SOURCE_MOUSE:
-        anchor = MenuItemView::TOPLEFT;
+        anchor = MENU_ANCHOR_TOPLEFT;
         break;
       case ui::MENU_SOURCE_TOUCH:
       case ui::MENU_SOURCE_TOUCH_EDIT_MENU:
-        anchor = MenuItemView::BOTTOMCENTER;
+        anchor = MENU_ANCHOR_BOTTOMCENTER;
         break;
       default:
         break;
     }
   }
 
   return holder_->RunMenuAt(parent, button, bounds, anchor, types);
 }
 
 bool MenuRunner::IsRunning() const {
   return holder_->running();
 }
 
 void MenuRunner::Cancel() {
   holder_->Cancel();
 }
 
 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