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

Unified Diff: ui/display/chromeos/x11/native_display_event_dispatcher_x11.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/display/chromeos/x11/native_display_event_dispatcher_x11.cc
diff --git a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc
index f5c2e2e929839f74e27b14e0dfde534c39fddf3b..c30b319dedff6bebeeeea3ef34bce4d0e97fa56f 100644
--- a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc
+++ b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc
@@ -37,21 +37,21 @@ uint32_t NativeDisplayEventDispatcherX11::DispatchEvent(
if (event->type - xrandr_event_base_ == RRScreenChangeNotify) {
VLOG(1) << "Received RRScreenChangeNotify event";
delegate_->UpdateXRandRConfiguration(event);
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
}
// Bail out early for everything except RRNotify_OutputChange events
// about an output getting connected or disconnected.
if (event->type - xrandr_event_base_ != RRNotify)
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
const XRRNotifyEvent* notify_event = reinterpret_cast<XRRNotifyEvent*>(event);
if (notify_event->subtype != RRNotify_OutputChange)
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
const XRROutputChangeNotifyEvent* output_change_event =
reinterpret_cast<XRROutputChangeNotifyEvent*>(event);
const int action = output_change_event->connection;
if (action != RR_Connected && action != RR_Disconnected)
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
const bool connected = (action == RR_Connected);
VLOG(1) << "Received RRNotify_OutputChange event:"
@@ -80,7 +80,7 @@ uint32_t NativeDisplayEventDispatcherX11::DispatchEvent(
if (connected && x11_output->crtc() == output_change_event->crtc &&
x11_mode->mode_id() == output_change_event->mode) {
VLOG(1) << "Ignoring event describing already-cached state";
- return POST_DISPATCH_PERFORM_DEFAULT;
+ return kPostDispatchPerformDefault;
}
found_changed_output = true;
break;
@@ -89,13 +89,13 @@ uint32_t NativeDisplayEventDispatcherX11::DispatchEvent(
if (!connected && !found_changed_output) {
VLOG(1) << "Ignoring event describing already-disconnected output";
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
}
}
delegate_->NotifyDisplayObservers();
- return ui::POST_DISPATCH_PERFORM_DEFAULT;
+ return ui::kPostDispatchPerformDefault;
}
void NativeDisplayEventDispatcherX11::SetTickClockForTest(

Powered by Google App Engine
This is Rietveld 408576698