Index: ui/events/platform/platform_event_source_unittest.cc |
diff --git a/ui/events/platform/platform_event_source_unittest.cc b/ui/events/platform/platform_event_source_unittest.cc |
index cc3496086d64ac95c432ee03542d5a3fb4e721cb..6c5f48c9df95562a2130d7268f3b26e6d04f0d89 100644 |
--- a/ui/events/platform/platform_event_source_unittest.cc |
+++ b/ui/events/platform/platform_event_source_unittest.cc |
@@ -87,7 +87,7 @@ class TestPlatformEventDispatcher : public PlatformEventDispatcher { |
PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this); |
} |
- void set_post_dispatch_action(uint32_t action) { |
+ void set_post_dispatch_action(ui::PostDispatchAction action) { |
post_dispatch_action_ = action; |
} |
@@ -97,7 +97,8 @@ class TestPlatformEventDispatcher : public PlatformEventDispatcher { |
return true; |
} |
- virtual uint32_t DispatchEvent(const PlatformEvent& event) override { |
+ virtual ui::PostDispatchAction DispatchEvent( |
+ const PlatformEvent& event) override { |
list_->push_back(id_); |
return post_dispatch_action_; |
} |
@@ -105,7 +106,7 @@ class TestPlatformEventDispatcher : public PlatformEventDispatcher { |
private: |
int id_; |
std::vector<int>* list_; |
- uint32_t post_dispatch_action_; |
+ ui::PostDispatchAction post_dispatch_action_; |
bool stop_stream_; |
DISALLOW_COPY_AND_ASSIGN(TestPlatformEventDispatcher); |
@@ -342,7 +343,8 @@ class RunCallbackDuringDispatch : public TestPlatformEventDispatcher { |
protected: |
// PlatformEventDispatcher: |
- virtual uint32_t DispatchEvent(const PlatformEvent& event) override { |
+ virtual ui::PostDispatchAction DispatchEvent( |
+ const PlatformEvent& event) override { |
if (!callback_.is_null()) |
callback_.Run(); |
return TestPlatformEventDispatcher::DispatchEvent(event); |
@@ -585,9 +587,11 @@ class DestroyScopedHandleDispatcher : public TestPlatformEventDispatcher { |
return true; |
} |
- virtual uint32_t DispatchEvent(const PlatformEvent& event) override { |
+ virtual ui::PostDispatchAction DispatchEvent( |
+ const PlatformEvent& event) override { |
handler_.reset(); |
- uint32_t action = TestPlatformEventDispatcher::DispatchEvent(event); |
+ ui::PostDispatchAction action = |
+ TestPlatformEventDispatcher::DispatchEvent(event); |
if (!callback_.is_null()) { |
callback_.Run(); |
callback_ = base::Closure(); |