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

Unified Diff: content/browser/aura/software_output_device_x11.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
Index: content/browser/aura/software_output_device_x11.cc
diff --git a/content/browser/aura/software_output_device_x11.cc b/content/browser/aura/software_output_device_x11.cc
index 229755b6ffb6fef9ec3b5893c51de04df273acc3..abdb116ed34b5bd0cfe8c21773da4cb4c72bf232 100644
--- a/content/browser/aura/software_output_device_x11.cc
+++ b/content/browser/aura/software_output_device_x11.cc
@@ -16,7 +16,7 @@ namespace content {
SoftwareOutputDeviceX11::SoftwareOutputDeviceX11(ui::Compositor* compositor)
: compositor_(compositor),
- display_(ui::GetXDisplay()),
+ display_(gfx::GetXDisplay()),
gc_(NULL),
image_(NULL) {
// TODO(skaslev) Remove this when crbug.com/180702 is fixed.

Powered by Google App Engine
This is Rietveld 408576698