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

views/focus/accelerator_handler_gtk_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 <gdk/gdkkeysyms.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
+#include "ui/base/models/accelerator.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/focus/focus_manager.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
 
 namespace views {
 
 class AcceleratorHandlerGtkTest
     : public testing::Test,
       public WidgetDelegate,
-      public AcceleratorTarget {
+      public ui::AcceleratorTarget {
  public:
   AcceleratorHandlerGtkTest()
       : kMenuAccelerator(ui::VKEY_MENU, false, false, false),
         kHomepageAccelerator(ui::VKEY_HOME, false, false, true),
         content_view_(NULL) {
   }
 
   virtual void SetUp() {
     window_ = Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 500, 500));
     window_->Show();
@@ skipping 20 matching lines @@
     // but the code should never depend on exact hardware keycodes, just the
     // fact that the code for presses and releases of the same key match.
     evt.hardware_keycode = keyval;
     evt.state = state;
     GtkWidget* widget = GTK_WIDGET(window_->GetNativeWindow());
     evt.window = widget->window;
     return evt;
   }
 
   // AcceleratorTarget implementation.
-  virtual bool AcceleratorPressed(const Accelerator& accelerator) {
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) {
     if (accelerator == kMenuAccelerator)
       menu_pressed_ = true;
     else if (accelerator == kHomepageAccelerator)
       home_pressed_ = true;
     return true;
   }
 
   // WidgetDelegate Implementation.
   virtual View* GetContentsView() {
     if (!content_view_)
       content_view_ = new View();
     return content_view_;
   }
   virtual const views::Widget* GetWidget() const {
     return content_view_->GetWidget();
   }
   virtual views::Widget* GetWidget() {
     return content_view_->GetWidget();
   }
 
   virtual void InitContentView() {
   }
 
  protected:
   bool menu_pressed_;
   bool home_pressed_;
 
  private:
-  Accelerator kMenuAccelerator;
-  Accelerator kHomepageAccelerator;
+  ui::Accelerator kMenuAccelerator;
+  ui::Accelerator kHomepageAccelerator;
   Widget* window_;
   View* content_view_;
   MessageLoopForUI message_loop_;
   DISALLOW_COPY_AND_ASSIGN(AcceleratorHandlerGtkTest);
 };
 
 // Test that the homepage accelerator (Alt+Home) is activated on key down
 // and that the menu accelerator (Alt) is never activated.
 TEST_F(AcceleratorHandlerGtkTest, TestHomepageAccelerator) {
   AcceleratorHandler handler;
@@ skipping 87 matching lines @@
 
   // Release Alt - now this should trigger the menu shortcut.
   evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Alt_L, 0);
   evt.hardware_keycode = 0x40;
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_TRUE(menu_pressed_);
 }
 
 }  // namespace views