ash/display/display_manager.h - Issue 192483007: Move chromeos/display/* to ui/display/chromeos

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_manager.h

Issue 192483007: Move chromeos/display/* to ui/display/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Include display.gyp into ChromeOS builds only Created 6 years, 9 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_manager.h

diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h

index a397c89ec9b1cd5786053c15bea232effba4546b..c17f73fe068a882c066d9d461aa3d87257191e9e 100644

--- a/ash/display/display_manager.h

+++ b/ash/display/display_manager.h

@@ -17,7 +17,7 @@

#include "ui/gfx/display.h"

#if defined(OS_CHROMEOS)

-#include "chromeos/display/output_configurator.h"

+#include "ui/display/chromeos/output_configurator.h"

#endif

namespace gfx {

@@ -45,7 +45,7 @@ class DisplayLayoutStore;

// TODO(oshima): Make this non internal.

class ASH_EXPORT DisplayManager

#if defined(OS_CHROMEOS)

- : public chromeos::OutputConfigurator::SoftwareMirroringController

+ : public ui::OutputConfigurator::SoftwareMirroringController

#endif

{

public:

« no previous file with comments | « ash/display/display_error_observer_chromeos.h ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »