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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/mirror_window_controller.cc

Issue 23460052: Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc » ('j') | ui/base/x/x11_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index e923219e8de52237622c6af7e71e11cf8d1631bf..2de135ad570149912535dcb8f9c540b46ce0f05a 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -35,7 +35,7 @@
#include "ui/gfx/native_widget_types.h"
#if defined(USE_X11)
-#include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_types.h"
#endif
namespace ash {
@@ -47,7 +47,7 @@ namespace {
void DisableInput(XID window) {
long event_mask = ExposureMask | VisibilityChangeMask |
StructureNotifyMask | PropertyChangeMask;
- XSelectInput(ui::GetXDisplay(), window, event_mask);
+ XSelectInput(gfx::GetXDisplay(), window, event_mask);
}
#endif
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.cc » ('j') | ui/base/x/x11_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698