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

Unified Diff: views/focus/focus_manager_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: 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
Index: views/focus/focus_manager_unittest.cc
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index b2497e369e94e842a6672db2e9ca23ee0b8e8cab..2d2e18b2a17d56e575fba5a2d49ed5f81365420e 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -1294,7 +1294,7 @@ class TestAcceleratorTarget : public AcceleratorTarget {
explicit TestAcceleratorTarget(bool process_accelerator)
: accelerator_count_(0), process_accelerator_(process_accelerator) {}
- virtual bool AcceleratorPressed(const Accelerator& accelerator) {
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) {
++accelerator_count_;
return process_accelerator_;
}
@@ -1401,7 +1401,7 @@ TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) {
}
// Unregisters itself when its accelerator is invoked.
-class SelfUnregisteringAcceleratorTarget : public AcceleratorTarget {
+class SelfUnregisteringAcceleratorTarget : public ui::AcceleratorTarget {
public:
SelfUnregisteringAcceleratorTarget(Accelerator accelerator,
FocusManager* focus_manager)
@@ -1410,7 +1410,7 @@ class SelfUnregisteringAcceleratorTarget : public AcceleratorTarget {
accelerator_count_(0) {
}
- virtual bool AcceleratorPressed(const Accelerator& accelerator) {
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) {
++accelerator_count_;
focus_manager_->UnregisterAccelerator(accelerator, this);
return true;
« views/accelerator.h ('K') | « views/focus/focus_manager.cc ('k') | views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698