| 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;
|
| }
|
|
|