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

Unified Diff: ui/aura/root_window_unittest.cc

Issue 10908127: events: Move EventTarget into Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months 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 | « ui/aura/root_window.cc ('k') | ui/aura/shared/compound_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_unittest.cc
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index e580426945540c0129e66fc5e3447963129120a6..7e9e093b66ccac1db135b1032cceeab565abd896 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -56,11 +56,11 @@ class NonClientDelegate : public test::TestWindowDelegate {
self->non_client_location_ = location;
return HTTOPLEFT;
}
- virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+ virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
mouse_event_count_++;
mouse_event_location_ = event->location();
mouse_event_flags_ = event->flags();
- return true;
+ return ui::ER_HANDLED;
}
private:
@@ -681,18 +681,18 @@ class DeletingWindowDelegate : public test::TestWindowDelegate {
private:
// Overridden from WindowDelegate:
- virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
+ virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
if (delete_during_handle_)
delete window_;
got_event_ = true;
- return false;
+ return ui::ER_UNHANDLED;
}
- virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+ virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
if (delete_during_handle_)
delete window_;
got_event_ = true;
- return false;
+ return ui::ER_UNHANDLED;
}
Window* window_;
« no previous file with comments | « ui/aura/root_window.cc ('k') | ui/aura/shared/compound_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698