Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Fix formatting 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/system/chromeos/power/power_event_observer.cc » ('j') | ui/display/OWNERS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 4f0b8cb28ffc8e964c964327483bd9ee650f32f6..a7ebe184ca436ca9ed1d76f19c7519a031c46e45 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -126,7 +126,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"
@@ -602,7 +602,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') | ui/display/OWNERS » ('J')

Powered by Google App Engine
This is Rietveld 408576698