Move views::Accelerator to ui in order to use it from aura code.

views/controls/menu/menu_delegate.h

 // Copyright (c) 2011 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.
 
 #ifndef VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 #define VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/events/event.h"
 
 using ui::OSExchangeData;
 
 namespace gfx {
 
 class Font;
 
 }  // namespace gfx
 
+namespace ui {
+
+class Accelerator;
+
+}  // namespace ui
+
 namespace views {
 
 class DropTargetEvent;
 class MenuButton;
 
 // MenuDelegate --------------------------------------------------------------
 
 // Delegate for a menu. This class is used as part of MenuItemView, see it
 // for details.
 // TODO(sky): merge this with ui::MenuModel.
@@ skipping 29 matching lines @@
 
   // The font for the menu item label.
   virtual const gfx::Font& GetLabelFont(int id) const;
 
   // The tooltip shown for the menu item. This is invoked when the user
   // hovers over the item, and no tooltip text has been set for that item.
   virtual string16 GetTooltipText(int id, const gfx::Point& screen_loc) const;
 
   // If there is an accelerator for the menu item with id |id| it is set in
   // |accelerator| and true is returned.
-  virtual bool GetAccelerator(int id, Accelerator* accelerator);
+  virtual bool GetAccelerator(int id, ui::Accelerator* accelerator);
 
   // Shows the context menu with the specified id. This is invoked when the
   // user does the appropriate gesture to show a context menu. The id
   // identifies the id of the menu to show the context menu for.
   // is_mouse_gesture is true if this is the result of a mouse gesture.
   // If this is not the result of a mouse gesture |p| is the recommended
   // location to display the content menu at. In either case, |p| is in
   // screen coordinates.
   // Returns true if a context menu was displayed, otherwise false
   virtual bool ShowContextMenu(MenuItemView* source,
@@ skipping 107 matching lines @@
   // Invoked prior to a menu being shown.
   virtual void WillShowMenu(MenuItemView* menu);
 
   // Invoked prior to a menu being hidden.
   virtual void WillHideMenu(MenuItemView* menu);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_