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

chrome/browser/ui/views/wrench_menu.cc

 // 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.
 
 #include "chrome/browser/ui/views/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 239 matching lines @@
 };
 
 string16 GetAccessibleNameForWrenchMenuItem(
       MenuModel* model, int item_index, int accessible_string_id) {
   string16 accessible_name = l10n_util::GetStringUTF16(accessible_string_id);
   string16 accelerator_text;
 
   ui::Accelerator menu_accelerator;
   if (model->GetAcceleratorAt(item_index, &menu_accelerator)) {
     accelerator_text =
-        views::Accelerator(menu_accelerator.key_code(),
-                           menu_accelerator.modifiers()).GetShortcutText();
+        ui::Accelerator(menu_accelerator.key_code(),
+                        menu_accelerator.modifiers()).GetShortcutText();
   }
 
   return MenuItemView::GetAccessibleNameForMenuItem(
       accessible_name, accelerator_text);
 }
 
 // WrenchMenuView is a view that can contain text buttons.
 class WrenchMenuView : public ScheduleAllView, public views::ButtonListener {
  public:
   WrenchMenuView(WrenchMenu* menu, MenuModel* menu_model)
@@ skipping 468 matching lines @@
   if (command_id == IDC_CUT || command_id == IDC_ZOOM_MINUS) {
     // These items are represented by child views. If ExecuteCommand is invoked
     // it means the user clicked on the area around the buttons and we should
     // not do anyting.
     return;
   }
 
   return entry.first->ActivatedAt(entry.second);
 }
 
-bool WrenchMenu::GetAccelerator(int id, views::Accelerator* accelerator) {
+bool WrenchMenu::GetAccelerator(int id, ui::Accelerator* accelerator) {
   if (is_bookmark_command(id))
     return false;
 
   const Entry& entry = id_to_entry_.find(id)->second;
   int command_id = entry.first->GetCommandIdAt(entry.second);
   if (command_id == IDC_CUT || command_id == IDC_ZOOM_MINUS) {
     // These have special child views; don't show the accelerator for them.
     return false;
   }
 
   ui::Accelerator menu_accelerator;
   if (!entry.first->GetAcceleratorAt(entry.second, &menu_accelerator))
     return false;
 
-  *accelerator = views::Accelerator(menu_accelerator.key_code(),
-                                    menu_accelerator.modifiers());
+  *accelerator = ui::Accelerator(menu_accelerator.key_code(),
+                                 menu_accelerator.modifiers());
   return true;
 }
 
 void WrenchMenu::WillShowMenu(MenuItemView* menu) {
   if (menu == bookmark_menu_)
     CreateBookmarkMenu();
 }
 
 void WrenchMenu::BookmarkModelChanged() {
   DCHECK(bookmark_menu_delegate_.get());
@@ skipping 108 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_->profile(),
                                NULL,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_OTHER_FOLDER,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }