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

chrome/browser/ui/views/frame/browser_view.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/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 75 matching lines @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/models/accelerator.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/single_split_view.h"
 #include "views/events/event.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #include "views/layout/grid_layout.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
@@ skipping 344 matching lines @@
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   if (cache.GetIndexOfProfileWithPath(browser_->profile()->GetPath()) ==
       std::string::npos) {
     return false;
   }
 
   return AvatarMenuModel::ShouldShowAvatarMenu();
 }
 
-bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
+bool BrowserView::AcceleratorPressed(const ui::Accelerator& accelerator) {
 #if defined(OS_CHROMEOS)
   // If accessibility is enabled, stop speech and return false so that key
   // combinations involving Search can be used for extra accessibility
   // functionality.
   if (accelerator.key_code() == ui::VKEY_LWIN &&
       g_browser_process->local_state()->GetBoolean(
           prefs::kAccessibilityEnabled)) {
     ExtensionTtsController::GetInstance()->Stop();
     return false;
   }
 #endif
 
-  std::map<views::Accelerator, int>::const_iterator iter =
+  std::map<ui::Accelerator, int>::const_iterator iter =
       accelerator_table_.find(accelerator);
   DCHECK(iter != accelerator_table_.end());
   int command_id = iter->second;
 
   if (!browser_->block_command_execution())
     UpdateAcceleratorMetrics(accelerator, command_id);
   return browser_->ExecuteCommandIfEnabled(command_id);
 }
 
 bool BrowserView::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
   // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators
   // anywhere so we need to check for them explicitly here.
   switch (cmd_id) {
     case IDC_CUT:
-      *accelerator = views::Accelerator(ui::VKEY_X, false, true, false);
+      *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false);
       return true;
     case IDC_COPY:
-      *accelerator = views::Accelerator(ui::VKEY_C, false, true, false);
+      *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false);
       return true;
     case IDC_PASTE:
-      *accelerator = views::Accelerator(ui::VKEY_V, false, true, false);
+      *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the accelerator table.
-  std::map<views::Accelerator, int>::iterator it =
-      accelerator_table_.begin();
+  std::map<ui::Accelerator, int>::iterator it = accelerator_table_.begin();
   for (; it != accelerator_table_.end(); ++it) {
     if (it->second == cmd_id) {
       *accelerator = it->first;
       return true;
     }
   }
   return false;
 }
 
 bool BrowserView::ActivateAppModalDialog() const {
@@ skipping 659 matching lines @@
   DCHECK(focus_manager);
 
 #if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
   // Views and WebKit use different tables for GdkEventKey -> views::KeyEvent
   // conversion. We need to use View's conversion table here to keep consistent
   // behavior with views::FocusManager::OnKeyEvent() method.
   // TODO(suzhe): We need to check if Windows code also has this issue, and
   // it'll be best if we can unify these conversion tables.
   // See http://crbug.com/54315
   views::KeyEvent views_event(reinterpret_cast<GdkEvent*>(event.os_event));
-  views::Accelerator accelerator(views_event.key_code(),
-                                 views_event.IsShiftDown(),
-                                 views_event.IsControlDown(),
-                                 views_event.IsAltDown());
+  ui::Accelerator accelerator(views_event.key_code(),
+                              views_event.IsShiftDown(),
+                              views_event.IsControlDown(),
+                              views_event.IsAltDown());
 #else
-  views::Accelerator accelerator(
+  ui::Accelerator accelerator(
       static_cast<ui::KeyboardCode>(event.windowsKeyCode),
       (event.modifiers & NativeWebKeyboardEvent::ShiftKey) ==
           NativeWebKeyboardEvent::ShiftKey,
       (event.modifiers & NativeWebKeyboardEvent::ControlKey) ==
           NativeWebKeyboardEvent::ControlKey,
       (event.modifiers & NativeWebKeyboardEvent::AltKey) ==
           NativeWebKeyboardEvent::AltKey);
 #endif
 
   // We first find out the browser command associated to the |event|.
@@ skipping 1098 matching lines @@
   CopyAcceleratorTable(accelerator_table, accelerators, count);
 
   views::FocusManager* focus_manager = GetFocusManager();
   DCHECK(focus_manager);
 
   // Let's fill our own accelerator table.
   for (int i = 0; i < count; ++i) {
     bool alt_down = (accelerators[i].fVirt & FALT) == FALT;
     bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL;
     bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT;
-    views::Accelerator accelerator(
+    ui::Accelerator accelerator(
         static_cast<ui::KeyboardCode>(accelerators[i].key),
         shift_down, ctrl_down, alt_down);
     accelerator_table_[accelerator] = accelerators[i].cmd;
 
     // Also register with the focus manager.
     focus_manager->RegisterAccelerator(accelerator, this);
   }
 
   // We don't need the Windows accelerator table anymore.
   free(accelerators);
 #else
   views::FocusManager* focus_manager = GetFocusManager();
   DCHECK(focus_manager);
   // Let's fill our own accelerator table.
   for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) {
-    views::Accelerator accelerator(browser::kAcceleratorMap[i].keycode,
-                                   browser::kAcceleratorMap[i].shift_pressed,
-                                   browser::kAcceleratorMap[i].ctrl_pressed,
-                                   browser::kAcceleratorMap[i].alt_pressed);
+    ui::Accelerator accelerator(browser::kAcceleratorMap[i].keycode,
+                                browser::kAcceleratorMap[i].shift_pressed,
+                                browser::kAcceleratorMap[i].ctrl_pressed,
+                                browser::kAcceleratorMap[i].alt_pressed);
     accelerator_table_[accelerator] = browser::kAcceleratorMap[i].command_id;
 
     // Also register with the focus manager.
     focus_manager->RegisterAccelerator(accelerator, this);
   }
 #endif
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 void BrowserView::BuildSystemMenuForBrowserWindow() {
@@ skipping 109 matching lines @@
 
     pref_service->SetInteger(prefs::kPluginMessageResponseTimeout,
                              plugin_message_response_timeout);
     pref_service->SetInteger(prefs::kHungPluginDetectFrequency,
                              hung_plugin_detect_freq);
   }
 #endif
 }
 
 void BrowserView::UpdateAcceleratorMetrics(
-    const views::Accelerator& accelerator, int command_id) {
+    const ui::Accelerator& accelerator, int command_id) {
   const ui::KeyboardCode key_code = accelerator.key_code();
   if (command_id == IDC_HELP_PAGE && key_code == ui::VKEY_F1)
     UserMetrics::RecordAction(UserMetricsAction("ShowHelpTabViaF1"));
 
 #if defined(OS_CHROMEOS)
   // Collect information about the relative popularity of various accelerators
   // on Chrome OS.
   switch (command_id) {
     case IDC_BACK:
       if (key_code == ui::VKEY_BACK)
@@ skipping 136 matching lines @@
   Bubble::Show(this->GetWidget(), bounds, views::BubbleBorder::TOP_RIGHT,
                views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE,
                bubble_view, bubble_view);
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
   AvatarMenuButton* button = frame_->GetAvatarMenuButton();
   if (button)
     button->ShowAvatarBubble();
 }