content/browser/aura/software_output_device_x11.h - Issue 23460052: Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/aura/software_output_device_x11.h

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: sdf 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.h

diff --git a/content/browser/aura/software_output_device_x11.h b/content/browser/aura/software_output_device_x11.h

index 986a486d754582145c6c742af86f30bbb4f20dbc..782afeee7ec512241dba383cde7e31633ecdcaa5 100644

--- a/content/browser/aura/software_output_device_x11.h

+++ b/content/browser/aura/software_output_device_x11.h

@@ -6,7 +6,7 @@

#define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_X11_H_

#include "cc/output/software_output_device.h"

-#include "ui/base/x/x11_util.h"

+#include "ui/gfx/x/x11_types.h"

namespace ui {

class Compositor;

@@ -28,7 +28,7 @@ class SoftwareOutputDeviceX11 : public cc::SoftwareOutputDevice {

void ClearImage();

ui::Compositor* compositor_;

- Display* display_;

+ XDisplay* display_;

GC gc_;

XImage* image_;

};

« no previous file with comments | « chrome/test/chromedriver/keycode_text_conversion_x.cc ('k') | content/browser/aura/software_output_device_x11.cc » ('j') | no next file with comments »