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

Unified Diff: ash/display/mirror_window_controller.cc

Issue 23622035: x11: Prefer using ui::GetXDisplay() over getting the Display from the X11 message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | « no previous file | ui/aura/root_window_host_x11.cc » ('j') | ui/aura/test/ui_controls_factory_aurax11.cc » ('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 1a338fec766960c1be6706bc3841889af1dbe6d0..ccdc1ebbcee5078d193f8ff2945ff3a3d13579de 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -34,6 +34,10 @@
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/native_widget_types.h"
+#if defined(USE_X11)
+#include "ui/base/x/x11_util.h"
+#endif
+
namespace ash {
namespace internal {
namespace {
@@ -43,7 +47,7 @@ namespace {
void DisableInput(XID window) {
long event_mask = ExposureMask | VisibilityChangeMask |
StructureNotifyMask | PropertyChangeMask;
- XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(),
+ XSelectInput(ui::GetXDisplay(),
window, event_mask);
oshima 2013/09/17 15:05:10 can you make this single line?
sadrul 2013/09/17 15:28:44 Done.
}
#endif
« no previous file with comments | « no previous file | ui/aura/root_window_host_x11.cc » ('j') | ui/aura/test/ui_controls_factory_aurax11.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698