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

Unified Diff: views/view_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/view_unittest.cc
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 03b7cfefa9433a8289cdc65a501e0f20fc1e5f1e..1d609e75fc13ca6b710dfbf704c3092239ee0c9e 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -215,7 +215,7 @@ class TestView : public View {
virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE;
virtual void Paint(gfx::Canvas* canvas) OVERRIDE;
virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
- virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE;
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
// OnBoundsChanged.
bool did_change_bounds_;
@@ -963,7 +963,7 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
////////////////////////////////////////////////////////////////////////////////
// Accelerators
////////////////////////////////////////////////////////////////////////////////
-bool TestView::AcceleratorPressed(const Accelerator& accelerator) {
+bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) {
accelerator_count_map_[accelerator]++;
return true;
}
« views/accelerator.h ('K') | « views/view.cc ('k') | views/window/dialog_client_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698