Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: views/focus/accelerator_handler_gtk_unittest.cc

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/focus/accelerator_handler_gtk.cc ('k') | views/focus/accelerator_handler_touch.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/focus/accelerator_handler_gtk_unittest.cc
diff --git a/views/focus/accelerator_handler_gtk_unittest.cc b/views/focus/accelerator_handler_gtk_unittest.cc
index bedd6d5add367de57519bf87059e5b93604d3e9f..098325dbab9e10170d644fc8b6cafdd615a039aa 100644
--- a/views/focus/accelerator_handler_gtk_unittest.cc
+++ b/views/focus/accelerator_handler_gtk_unittest.cc
@@ -1,4 +1,4 @@
-// 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.
@@ -6,6 +6,7 @@
#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"
@@ -17,7 +18,7 @@ namespace views {
class AcceleratorHandlerGtkTest
: public testing::Test,
public WidgetDelegate,
- public AcceleratorTarget {
+ public ui::AcceleratorTarget {
public:
AcceleratorHandlerGtkTest()
: kMenuAccelerator(ui::VKEY_MENU, false, false, false),
@@ -58,7 +59,7 @@ class AcceleratorHandlerGtkTest
}
// 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)
@@ -87,8 +88,8 @@ class AcceleratorHandlerGtkTest
bool home_pressed_;
private:
- Accelerator kMenuAccelerator;
- Accelerator kHomepageAccelerator;
+ ui::Accelerator kMenuAccelerator;
+ ui::Accelerator kHomepageAccelerator;
Widget* window_;
View* content_view_;
MessageLoopForUI message_loop_;
« no previous file with comments | « views/focus/accelerator_handler_gtk.cc ('k') | views/focus/accelerator_handler_touch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698