ui/base/x/events_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: ui/base/x/events_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: 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: ui/base/x/events_x.cc

diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc

index baa3bcf7bdc113c792b58bf7032a3e7d4b35f181..06301a9b08607b61d8eed7b9e555bee01d61f546 100644

--- a/ui/base/x/events_x.cc

+++ b/ui/base/x/events_x.cc

@@ -260,7 +260,7 @@ double GetTouchParamFromXEvent(XEvent* xev,

}

Atom GetNoopEventAtom() {

- return XInternAtom(ui::GetXDisplay(), "noop", False);

+ return XInternAtom(gfx::GetXDisplay(), "noop", False);

}

} // namespace

@@ -268,7 +268,7 @@ Atom GetNoopEventAtom() {

namespace ui {

void UpdateDeviceList() {

- Display* display = GetXDisplay();

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

DeviceListCacheX::GetInstance()->UpdateDeviceList(display);

TouchFactory::GetInstance()->UpdateDeviceList(display);

DeviceDataManager::GetInstance()->UpdateDeviceList(display);

« no previous file with comments | « ui/base/x/device_data_manager.cc ('k') | ui/base/x/selection_utils.cc » ('j') | no next file with comments »