ash/shell.cc - 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/shell.cc

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

diff --git a/ash/shell.cc b/ash/shell.cc

index ee56b839348e74fb9cdb1794e0b3427e5908128f..09803574aebdcdbd347ee79f28063923dd515fb9 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -120,7 +120,7 @@

#include "ash/display/projecting_observer_chromeos.h"

#include "base/message_loop/message_pump_x11.h"

#include "base/sys_info.h"

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

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

#endif // defined(USE_X11)

#include "ash/display/resolution_notification_controller.h"

#include "ash/sticky_keys/sticky_keys_controller.h"

@@ -598,7 +598,7 @@ Shell::Shell(ShellDelegate* delegate)

window_positioner_(new WindowPositioner),

activation_client_(NULL),

#if defined(OS_CHROMEOS) && defined(USE_X11)

- output_configurator_(new chromeos::OutputConfigurator()),

+ output_configurator_(new ui::OutputConfigurator()),

#endif // defined(OS_CHROMEOS) && defined(USE_X11)

native_cursor_manager_(new AshNativeCursorManager),

cursor_manager_(scoped_ptr<views::corewm::NativeCursorManager>(

« no previous file with comments | « ash/shell.h ('k') | ash/system/chromeos/power/power_event_observer.cc » ('j') | no next file with comments »