| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/aura/test/test_window_delegate.h" | 5 #include "ui/aura/test/test_window_delegate.h" |
| 6 | 6 |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
| 9 #include "ui/base/events/event.h" | 9 #include "ui/base/events/event.h" |
| 10 #include "ui/base/hit_test.h" | 10 #include "ui/base/hit_test.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 } | 98 } |
| 99 | 99 |
| 100 ui::EventResult TestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) { | 100 ui::EventResult TestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) { |
| 101 return ui::ER_UNHANDLED; | 101 return ui::ER_UNHANDLED; |
| 102 } | 102 } |
| 103 | 103 |
| 104 ui::EventResult TestWindowDelegate::OnMouseEvent(ui::MouseEvent* event) { | 104 ui::EventResult TestWindowDelegate::OnMouseEvent(ui::MouseEvent* event) { |
| 105 return ui::ER_UNHANDLED; | 105 return ui::ER_UNHANDLED; |
| 106 } | 106 } |
| 107 | 107 |
| 108 ui::TouchStatus TestWindowDelegate::OnTouchEvent(ui::TouchEvent* event) { | 108 ui::EventResult TestWindowDelegate::OnTouchEvent(ui::TouchEvent* event) { |
| 109 return ui::TOUCH_STATUS_UNKNOWN; | 109 return ui::ER_UNHANDLED; |
| 110 } | 110 } |
| 111 | 111 |
| 112 ui::EventResult TestWindowDelegate::OnGestureEvent( | 112 ui::EventResult TestWindowDelegate::OnGestureEvent( |
| 113 ui::GestureEvent* event) { | 113 ui::GestureEvent* event) { |
| 114 return ui::ER_UNHANDLED; | 114 return ui::ER_UNHANDLED; |
| 115 } | 115 } |
| 116 | 116 |
| 117 //////////////////////////////////////////////////////////////////////////////// | 117 //////////////////////////////////////////////////////////////////////////////// |
| 118 // ColorTestWindowDelegate | 118 // ColorTestWindowDelegate |
| 119 | 119 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 std::string result = StringPrintf("%d %d", | 224 std::string result = StringPrintf("%d %d", |
| 225 key_press_count_, | 225 key_press_count_, |
| 226 key_release_count_); | 226 key_release_count_); |
| 227 key_press_count_ = 0; | 227 key_press_count_ = 0; |
| 228 key_release_count_ = 0; | 228 key_release_count_ = 0; |
| 229 return result; | 229 return result; |
| 230 } | 230 } |
| 231 | 231 |
| 232 } // namespace test | 232 } // namespace test |
| 233 } // namespace aura | 233 } // namespace aura |
| OLD | NEW |