ash/display/display_controller_unittest.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: ash/display/display_controller_unittest.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: ash/display/display_controller_unittest.cc

diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc

index 485e58291980a799e803fd41cec7baae1685375d..287b0e4f455ba25a4448deff9c9330b6536eace8 100644

--- a/ash/display/display_controller_unittest.cc

+++ b/ash/display/display_controller_unittest.cc

@@ -29,7 +29,7 @@

#include "ui/views/widget/widget.h"

#if defined(USE_X11)

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

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

#include <X11/Xlib.h>

#undef RootWindow

#endif

@@ -288,7 +288,7 @@ void GetPrimaryAndSeconary(aura::RootWindow** primary,

std::string GetXWindowName(aura::RootWindow* window) {

char* name = NULL;

- XFetchName(ui::GetXDisplay(), window->GetAcceleratedWidget(), &name);

+ XFetchName(gfx::GetXDisplay(), window->GetAcceleratedWidget(), &name);

std::string ret(name);

XFree(name);

return ret;

« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/mirror_window_controller.cc » ('j') | ui/base/x/x11_util.h » ('J')