chrome/test/webdriver/keycode_text_conversion_x.cc - 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: chrome/test/webdriver/keycode_text_conversion_x.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: chrome/test/webdriver/keycode_text_conversion_x.cc

diff --git a/chrome/test/webdriver/keycode_text_conversion_x.cc b/chrome/test/webdriver/keycode_text_conversion_x.cc

index b5cb42dbfdd8a0af8f46dcc1e4a4cf7a6642040a..e16eaf9f6885365f39192ead4d1739c364f660bf 100644

--- a/chrome/test/webdriver/keycode_text_conversion_x.cc

+++ b/chrome/test/webdriver/keycode_text_conversion_x.cc

@@ -187,7 +187,7 @@ std::string ConvertKeyCodeToText(ui::KeyboardCode key_code, int modifiers) {

XEvent event;

memset(&event, 0, sizeof(XEvent));

XKeyEvent* key_event = &event.xkey;

- Display* display = ui::GetXDisplay();

+ XDisplay* display = gfx::GetXDisplay();

key_event->display = display;

key_event->keycode = x_key_code;

if (modifiers & automation::kShiftKeyMask)

« no previous file with comments | « chrome/test/chromedriver/keycode_text_conversion_x.cc ('k') | content/browser/aura/software_output_device_x11.h » ('j') | ui/base/x/x11_util.h » ('J')