ash/display/display_controller.cc - Issue 292443002: linux_aura: Compile ash into chrome.

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.cc

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: Rebase to ToT Created 6 years, 7 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:

Index: ash/display/display_controller.cc

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

index 35ae9d3ab5215cad0e37542a7dfa385629754f34..99c997f246001f49af953691379c99b688772e87 100644

--- a/ash/display/display_controller.cc

+++ b/ash/display/display_controller.cc

@@ -44,6 +44,8 @@

#include "ash/display/display_configurator_animation.h"

#include "base/sys_info.h"

#include "base/time/time.h"

+#endif // defined(OS_CHROMEOS)

#if defined(USE_X11)

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

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

@@ -53,7 +55,7 @@

#include <X11/extensions/Xrandr.h>

#undef RootWindow

#endif // defined(USE_X11)

-#endif // defined(OS_CHROMEOS)

namespace ash {

namespace {

« no previous file with comments | « ash/ash_constants.cc ('k') | ash/drag_drop/drag_drop_interactive_uitest.cc » ('j') | no next file with comments »