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

Unified Diff: ash/display/mirror_window_controller.h

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: fix windows build Created 4 years, 2 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/display/extended_mouse_warp_controller_unittest.cc ('k') | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller.h
diff --git a/ash/display/mirror_window_controller.h b/ash/display/mirror_window_controller.h
index 55a34f6aaed8cb5d5ea332e3f3c730f90d83f1ee..91ad7545a4b3fafff9754cfe4780e68200d0d6b8 100644
--- a/ash/display/mirror_window_controller.h
+++ b/ash/display/mirror_window_controller.h
@@ -12,12 +12,12 @@
#include <vector>
#include "ash/ash_export.h"
-#include "ash/display/display_manager.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host_observer.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/native_widget_types.h"
@@ -97,7 +97,7 @@ class ASH_EXPORT MirrorWindowController : public aura::WindowTreeHostObserver {
typedef std::map<int64_t, MirroringHostInfo*> MirroringHostInfoMap;
MirroringHostInfoMap mirroring_host_info_map_;
- DisplayManager::MultiDisplayMode multi_display_mode_;
+ display::DisplayManager::MultiDisplayMode multi_display_mode_;
std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
« no previous file with comments | « ash/display/extended_mouse_warp_controller_unittest.cc ('k') | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698