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

Unified Diff: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.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/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
index e0840cc43e84fc5bd0ac1abb2094c692dc7ed1bf..5474e5edca8cdcdc79737e6afb3e9c01d4075dcc 100644
--- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
+++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
@@ -69,7 +69,7 @@ bool X11WholeScreenMoveLoop::CanDispatchEvent(const ui::PlatformEvent& event) {
uint32_t X11WholeScreenMoveLoop::DispatchEvent(const ui::PlatformEvent& event) {
// This method processes all events while the move loop is active.
if (!in_move_loop_)
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
XEvent* xev = event;
switch (xev->type) {
@@ -84,7 +84,7 @@ uint32_t X11WholeScreenMoveLoop::DispatchEvent(const ui::PlatformEvent& event) {
base::Bind(&X11WholeScreenMoveLoop::DispatchMouseMovement,
weak_factory_.GetWeakPtr()));
}
- return ui::POST_DISPATCH_NONE;
+ return ui::kPostDispatchNone;
}
case ButtonRelease: {
if (xev->xbutton.button == Button1) {
@@ -97,16 +97,16 @@ uint32_t X11WholeScreenMoveLoop::DispatchEvent(const ui::PlatformEvent& event) {
// If the source widget had capture prior to the move loop starting,
// it may be relying on views::Widget getting the mouse release and
// releasing capture in Widget::OnMouseEvent().
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
}
}
- return ui::POST_DISPATCH_NONE;
+ return ui::kPostDispatchNone;
}
case KeyPress: {
if (ui::KeyboardCodeFromXKeyEvent(xev) == ui::VKEY_ESCAPE) {
canceled_ = true;
EndMoveLoop();
- return ui::POST_DISPATCH_NONE;
+ return ui::kPostDispatchNone;
}
break;
}
@@ -141,7 +141,7 @@ uint32_t X11WholeScreenMoveLoop::DispatchEvent(const ui::PlatformEvent& event) {
}
}
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
}
bool X11WholeScreenMoveLoop::RunMoveLoop(aura::Window* source,

Powered by Google App Engine
This is Rietveld 408576698