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

Unified Diff: ui/views/test/ui_controls_factory_desktop_aurax11.cc

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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/test/ui_controls_factory_desktop_aurax11.cc
diff --git a/ui/views/test/ui_controls_factory_desktop_aurax11.cc b/ui/views/test/ui_controls_factory_desktop_aurax11.cc
index bffa77bb71de70203a6747f463e646d53262fb14..5fd0e1e38794a5ffceac5fee6559d2e9e247de81 100644
--- a/ui/views/test/ui_controls_factory_desktop_aurax11.cc
+++ b/ui/views/test/ui_controls_factory_desktop_aurax11.cc
@@ -140,11 +140,11 @@ class UIControlsDesktopX11 : public UIControlsAura {
xevent.xkey.keycode =
XKeysymToKeycode(x_display_,
ui::XKeysymForWindowsKeyCode(key, shift));
- dispatcher->PostNativeEvent(&xevent);
+ dispatcher->host()->PostNativeEvent(&xevent);
// Send key release events.
xevent.xkey.type = KeyRelease;
- dispatcher->PostNativeEvent(&xevent);
+ dispatcher->host()->PostNativeEvent(&xevent);
if (alt)
UnmaskAndSetKeycodeThenSend(dispatcher, &xevent, Mod1Mask, XK_Alt_L);
if (shift)
@@ -185,7 +185,7 @@ class UIControlsDesktopX11 : public UIControlsAura {
xmotion->state = button_down_mask;
xmotion->same_screen = True;
// RootWindow will take care of other necessary fields.
- root_window->GetDispatcher()->PostNativeEvent(&xevent);
+ root_window->GetDispatcher()->host()->PostNativeEvent(&xevent);
RunClosureAfterAllPendingUIEvents(closure);
return true;
}
@@ -224,12 +224,12 @@ class UIControlsDesktopX11 : public UIControlsAura {
// RootWindow will take care of other necessary fields.
if (state & DOWN) {
xevent.xbutton.type = ButtonPress;
- root_window->GetDispatcher()->PostNativeEvent(&xevent);
+ root_window->GetDispatcher()->host()->PostNativeEvent(&xevent);
button_down_mask |= xbutton->state;
}
if (state & UP) {
xevent.xbutton.type = ButtonRelease;
- root_window->GetDispatcher()->PostNativeEvent(&xevent);
+ root_window->GetDispatcher()->host()->PostNativeEvent(&xevent);
button_down_mask = (button_down_mask | xbutton->state) ^ xbutton->state;
}
RunClosureAfterAllPendingUIEvents(closure);
@@ -280,7 +280,7 @@ class UIControlsDesktopX11 : public UIControlsAura {
KeySym keysym,
unsigned int mask) {
xevent->xkey.keycode = XKeysymToKeycode(x_display_, keysym);
- root_window->PostNativeEvent(xevent);
+ root_window->host()->PostNativeEvent(xevent);
xevent->xkey.state |= mask;
}
@@ -290,7 +290,7 @@ class UIControlsDesktopX11 : public UIControlsAura {
KeySym keysym) {
xevent->xkey.state ^= mask;
xevent->xkey.keycode = XKeysymToKeycode(x_display_, keysym);
- root_window->PostNativeEvent(xevent);
+ root_window->host()->PostNativeEvent(xevent);
}
// Our X11 state.

Powered by Google App Engine
This is Rietveld 408576698