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

chrome/browser/chromeos/login/screen_locker_views.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/chromeos/login/screen_locker_views.h"
 
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
@@ skipping 729 matching lines @@
 
 views::View* ScreenLockerViews::GetViewByID(int id) {
   return lock_widget_->GetRootView()->GetViewByID(id);
 }
 
 void ScreenLockerViews::ScreenLockReady() {
   ScreenLockerDelegate::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());
   } else {
     // Don't enable the password field until we grab all inputs.
     SetInputEnabled(true);
   }
 }
 
 void ScreenLockerViews::OnAuthenticate() {
@@ skipping 93 matching lines @@
   secondary_view_.reset(captcha_view_);
   ShowErrorMessage(postponed_error_message_, false);
   postponed_error_message_.clear();
 }
 
 ScreenLockerViews::~ScreenLockerViews() {
   if (input_event_observer_.get())
     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());
   }
 
   gdk_keyboard_ungrab(GDK_CURRENT_TIME);
   gdk_pointer_ungrab(GDK_CURRENT_TIME);
 
   DCHECK(lock_window_);
   VLOG(1) << "~ScreenLocker(): Closing ScreenLocker window.";
   lock_window_->Close();
@@ skipping 31 matching lines @@
   if (mouse_event_relay_.get())
     MessageLoopForUI::current()->RemoveObserver(mouse_event_relay_.get());
   mouse_event_relay_.reset(
       new MouseEventRelay(lock_widget_->GetNativeView()->window,
                           error_info_->GetNativeView()->window));
   MessageLoopForUI::current()->AddObserver(mouse_event_relay_.get());
 #endif
 }
 
 bool ScreenLockerViews::AcceleratorPressed(
-    const views::Accelerator& accelerator) {
+    const ui::Accelerator& accelerator) {
   if (!background_view_->IsScreenSaverVisible()) {
     screen_locker_view_->StartScreenSaver();
     return true;
   }
   return false;
 }
 
 void ScreenLockerViews::OnClientEvent(GtkWidget* widge, GdkEventClient* event) {
 #if defined(TOOLKIT_USES_GTK)
   WmIpc::Message msg;
   WmIpc::instance()->DecodeMessage(*event, &msg);
   if (msg.type() == WM_IPC_MESSAGE_CHROME_NOTIFY_SCREEN_REDRAWN_FOR_LOCK) {
     OnWindowManagerReady();
   }
 #endif
 }
 
 }  // namespace chromeos