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

Unified Diff: ui/wm/core/nested_accelerator_dispatcher_linux.cc

Issue 666673005: Explicitly coerce PostDispatchAction to uint32_t in DispatchEvent() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui_enums
Patch Set: sigh. Windows. Created 6 years, 2 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
Index: ui/wm/core/nested_accelerator_dispatcher_linux.cc
diff --git a/ui/wm/core/nested_accelerator_dispatcher_linux.cc b/ui/wm/core/nested_accelerator_dispatcher_linux.cc
index ee5b587225cf6149e8bbe5b0301a911240102e4e..e2ac376f39337529c327d236bf6898aeb8d5b539 100644
--- a/ui/wm/core/nested_accelerator_dispatcher_linux.cc
+++ b/ui/wm/core/nested_accelerator_dispatcher_linux.cc
@@ -64,7 +64,8 @@ class NestedAcceleratorDispatcherLinux : public NestedAcceleratorDispatcher,
return true;
}
- virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override {
+ virtual ui::PostDispatchAction DispatchEvent(
+ const ui::PlatformEvent& event) override {
if (IsKeyEvent(event)) {
ui::KeyEvent key_event(event);
ui::Accelerator accelerator = CreateAcceleratorFromKeyEvent(key_event);
@@ -76,17 +77,16 @@ class NestedAcceleratorDispatcherLinux : public NestedAcceleratorDispatcher,
#else
NOTIMPLEMENTED();
#endif
- return ui::POST_DISPATCH_NONE;
+ return ui::kPostDispatchNone;
case NestedAcceleratorDelegate::RESULT_PROCESSED:
- return ui::POST_DISPATCH_NONE;
+ return ui::kPostDispatchNone;
case NestedAcceleratorDelegate::RESULT_NOT_PROCESSED:
break;
}
}
ui::PlatformEventDispatcher* prev = *restore_dispatcher_;
- return prev ? prev->DispatchEvent(event)
- : ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return prev ? prev->DispatchEvent(event) : ui::kPostDispatchPerformDefault;
}
scoped_ptr<ui::ScopedEventDispatcher> restore_dispatcher_;

Powered by Google App Engine
This is Rietveld 408576698