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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/aura/wm_shell_aura.cc

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/accelerators/accelerator_controller_unittest.cc ('k') | ash/autoclick/autoclick_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index b316f8df03458eb5a584f73ca76c624374caa2d5..42036732c97f12a4c12afbdf493eb4281ca2799e 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -17,7 +17,6 @@
#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_activation_observer.h"
#include "ash/common/wm_display_observer.h"
-#include "ash/display/display_manager.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/laser/laser_pointer_controller.h"
#include "ash/metrics/task_switch_metrics_recorder.h"
@@ -34,6 +33,7 @@
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/env.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/wm/public/activation_client.h"
#if defined(OS_CHROMEOS)
@@ -138,7 +138,8 @@ bool WmShellAura::IsInUnifiedMode() const {
bool WmShellAura::IsInUnifiedModeIgnoreMirroring() const {
return Shell::GetInstance()
->display_manager()
- ->current_default_multi_display_mode() == DisplayManager::UNIFIED;
+ ->current_default_multi_display_mode() ==
+ display::DisplayManager::UNIFIED;
}
bool WmShellAura::IsForceMaximizeOnFirstRun() {
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/autoclick/autoclick_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698