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

This is the first preliminary change for the support of global keyboard shortcut.

BUG=97255
TEST=None

Review URL: http://codereview.chromium.org/8508055

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109872 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 24 insertions, 25 deletions

diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index 27fa015..489fa04 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -71,7 +71,7 @@ class SimpleMenuModelDelegateAdapter : public views::MenuDelegate {
 
   // views::MenuDelegate implementation.
   virtual bool GetAccelerator(int id,
-                              views::Accelerator* accelerator) OVERRIDE;
+                              ui::Accelerator* accelerator) OVERRIDE;
   virtual string16 GetLabel(int id) const OVERRIDE;
   virtual bool IsCommandEnabled(int id) const OVERRIDE;
   virtual bool IsItemChecked(int id) const OVERRIDE;
@@ -93,7 +93,7 @@ SimpleMenuModelDelegateAdapter::SimpleMenuModelDelegateAdapter(
 
 bool SimpleMenuModelDelegateAdapter::GetAccelerator(
     int id,
-    views::Accelerator* accelerator) {
+    ui::Accelerator* accelerator) {
   return simple_menu_model_delegate_->GetAcceleratorForCommandId(
       id, accelerator);
 }
diff --git a/chrome/browser/chromeos/login/screen_locker.h b/chrome/browser/chromeos/login/screen_locker.h
index de79abe..2397b8c 100644
--- a/chrome/browser/chromeos/login/screen_locker.h
+++ b/chrome/browser/chromeos/login/screen_locker.h
@@ -13,7 +13,7 @@
 #include "base/time.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/screen_locker_delegate.h"
-#include "views/accelerator.h"
+#include "ui/base/models/accelerator.h"
 
 namespace gfx {
 class Rect;
diff --git a/chrome/browser/chromeos/login/screen_locker_views.cc b/chrome/browser/chromeos/login/screen_locker_views.cc
index ed5657d..dd4d4fa 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.cc
+++ b/chrome/browser/chromeos/login/screen_locker_views.cc
@@ -747,7 +747,7 @@ void ScreenLockerViews::ScreenLockReady() {
 
   if (background_view_->ScreenSaverEnabled()) {
     lock_widget_->GetFocusManager()->RegisterAccelerator(
-        views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+        ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
     locker_input_event_observer_.reset(new LockerInputEventObserver(this));
     MessageLoopForUI::current()->AddObserver(
         locker_input_event_observer_.get());
@@ -861,7 +861,7 @@ ScreenLockerViews::~ScreenLockerViews() {
     MessageLoopForUI::current()->RemoveObserver(input_event_observer_.get());
   if (locker_input_event_observer_.get()) {
     lock_widget_->GetFocusManager()->UnregisterAccelerator(
-        views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+        ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
     MessageLoopForUI::current()->RemoveObserver(
         locker_input_event_observer_.get());
   }
@@ -913,7 +913,7 @@ void ScreenLockerViews::ShowErrorBubble(
 }
 
 bool ScreenLockerViews::AcceleratorPressed(
-    const views::Accelerator& accelerator) {
+    const ui::Accelerator& accelerator) {
   if (!background_view_->IsScreenSaverVisible()) {
     screen_locker_view_->StartScreenSaver();
     return true;
diff --git a/chrome/browser/chromeos/login/screen_locker_views.h b/chrome/browser/chromeos/login/screen_locker_views.h
index db95a5c..aa6eef8 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.h
+++ b/chrome/browser/chromeos/login/screen_locker_views.h
@@ -30,7 +30,7 @@ class ScreenLockerTester;
 class ScreenLockerViews : public ScreenLockerDelegate,
                           public MessageBubbleDelegate,
                           public CaptchaView::Delegate,
-                          public views::AcceleratorTarget {
+                          public ui::AcceleratorTarget {
  public:
   // Interface that helps switching from ScreenLockView to CaptchaView.
   class ScreenLockViewContainer {
@@ -90,9 +90,8 @@ class ScreenLockerViews : public ScreenLockerDelegate,
   void ShowErrorBubble(const string16& message,
                        views::BubbleBorder::ArrowLocation arrow_location);
 
-  // Overridden from AcceleratorTarget:
-  virtual bool AcceleratorPressed(const views::Accelerator& accelerator)
-      OVERRIDE;
+  // Overridden from ui::AcceleratorTarget:
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
   // Event handler for client-event.
   CHROMEGTK_CALLBACK_1(ScreenLockerViews, void, OnClientEvent, GdkEventClient*);
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 2562826..589f8be 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -118,11 +118,11 @@ WebUILoginView::WebUILoginView()
   // Make sure the singleton VirtualKeyboardManager object is created.
   VirtualKeyboardManager::GetInstance();
 #endif
-  accel_map_[views::Accelerator(ui::VKEY_Z, false, true, true)] =
+  accel_map_[ui::Accelerator(ui::VKEY_Z, false, true, true)] =
       kAccelNameAccessibility;
-  accel_map_[views::Accelerator(ui::VKEY_ESCAPE, false, false, false)] =
+  accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, false, false, false)] =
       kAccelNameCancel;
-  accel_map_[views::Accelerator(ui::VKEY_E, false, true, true)] =
+  accel_map_[ui::Accelerator(ui::VKEY_E, false, true, true)] =
       kAccelNameEnrollment;
 
   for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
@@ -153,7 +153,7 @@ std::string WebUILoginView::GetClassName() const {
 }
 
 bool WebUILoginView::AcceleratorPressed(
-    const views::Accelerator& accelerator) {
+    const ui::Accelerator& accelerator) {
   AccelMap::const_iterator entry = accel_map_.find(accelerator);
   if (entry == accel_map_.end())
     return false;
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index a5f5ce5..7826c42 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -46,7 +46,7 @@ class WebUILoginView : public views::WidgetDelegateView,
 
   // Overridden from views::Views:
   virtual bool AcceleratorPressed(
-      const views::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
 
   // Called when WebUI window is created.
@@ -104,7 +104,7 @@ class WebUILoginView : public views::WidgetDelegateView,
 
  private:
   // Map type for the accelerator-to-identifier map.
-  typedef std::map<views::Accelerator, std::string> AccelMap;
+  typedef std::map<ui::Accelerator, std::string> AccelMap;
 
   // Overridden from TabContentsDelegate.
   virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
index 833052c..d00ecf4 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
@@ -18,18 +18,18 @@
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "views/accelerator.h"
+#include "ui/base/models/accelerator.h"
 #include "views/view.h"
 
 namespace chromeos {
 
-scoped_ptr<views::Accelerator> WizardAccessibilityHelper::accelerator_;
+scoped_ptr<ui::Accelerator> WizardAccessibilityHelper::accelerator_;
 
 // static
-views::Accelerator WizardAccessibilityHelper::GetAccelerator() {
+ui::Accelerator WizardAccessibilityHelper::GetAccelerator() {
   if (!WizardAccessibilityHelper::accelerator_.get())
     WizardAccessibilityHelper::accelerator_.reset(
-        new views::Accelerator(ui::VKEY_Z, false, true, true));
+        new ui::Accelerator(ui::VKEY_Z, false, true, true));
   return *(WizardAccessibilityHelper::accelerator_.get());
 }
 
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.h b/chrome/browser/chromeos/login/wizard_accessibility_helper.h
index 5cd0cfd..f89854c 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.h
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.h
@@ -11,10 +11,10 @@
 #include "chrome/browser/chromeos/login/wizard_accessibility_handler.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/models/accelerator.h"
 
 class Profile;
 namespace views {
-class Accelerator;
 class View;
 }
 
@@ -28,7 +28,7 @@ class WizardAccessibilityHelper {
   static WizardAccessibilityHelper* GetInstance();
 
   // Get accelerator for enabling accessibility.
-  static views::Accelerator GetAccelerator();
+  static ui::Accelerator GetAccelerator();
 
   // Speak the given text if the accessibility pref is already set. |queue|
   // specifies whether this utterance will be queued or spoken immediately.
@@ -59,7 +59,7 @@ class WizardAccessibilityHelper {
 
   void SetAccessibilityEnabled(bool);
 
-  static scoped_ptr<views::Accelerator> accelerator_;
+  static scoped_ptr<ui::Accelerator> accelerator_;
 
   scoped_ptr<WizardAccessibilityHandler> accessibility_handler_;
 
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 40730dd..86fed61 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -42,7 +42,7 @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_types.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "views/accelerator.h"
+#include "ui/base/models/accelerator.h"
 
 #if defined(USE_LINUX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 3748481..a266c59 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -21,8 +21,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/models/accelerator.h"
 #include "unicode/locid.h"
-#include "views/accelerator.h"
 
 namespace chromeos {