Relocate display_manager from ash to ui

Move display_manager from ash to ui so that it can be used in mus and in ash. BUG=581462 Review-Url: https://codereview.chromium.org/2445583002 Cr-Commit-Position: refs/heads/master@{#428567}
Denger-Network · Oct 29, 2016 · 72f8154 · 72f8154
1 parent a6f9f62
commit 72f8154
Show file tree

Hide file tree

Showing 110 changed files with 615 additions and 583 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -617,8 +617,6 @@ component("ash") {
     "display/display_configuration_controller.h",
     "display/display_error_observer_chromeos.cc",
     "display/display_error_observer_chromeos.h",
-    "display/display_manager.cc",
-    "display/display_manager.h",
     "display/display_pref_util.h",
     "display/display_util.cc",
     "display/display_util.h",

diff --git a/ash/accelerators/accelerator_commands_aura.cc b/ash/accelerators/accelerator_commands_aura.cc
@@ -6,10 +6,10 @@
 
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_window.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "base/metrics/user_metrics.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 
 namespace ash {
@@ -22,7 +22,8 @@ void ToggleTouchHudProjection() {
 }
 
 bool IsInternalDisplayZoomEnabled() {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   return display_manager->IsDisplayUIScalingEnabled() ||
          display_manager->IsInUnifiedMode();
 }
@@ -33,13 +34,15 @@ bool ZoomInternalDisplay(bool up) {
   else
     base::RecordAction(base::UserMetricsAction("Accel_Scale_Ui_Down"));
 
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   return display_manager->ZoomInternalDisplay(up);
 }
 
 void ResetInternalDisplayZoom() {
   base::RecordAction(base::UserMetricsAction("Accel_Scale_Ui_Reset"));
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   display_manager->ResetInternalDisplayZoom();
 }
 

diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -22,7 +22,6 @@
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/debug.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/magnifier/magnification_controller.h"
@@ -48,6 +47,7 @@
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
@@ -19,11 +19,9 @@
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_animator.h"
 #include "ash/wm/lock_state_controller.h"
@@ -34,6 +32,7 @@
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"

diff --git 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() {

diff --git a/ash/autoclick/autoclick_unittest.cc b/ash/autoclick/autoclick_unittest.cc
@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 #include "ash/autoclick/autoclick_controller.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"

diff --git a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
@@ -12,14 +12,12 @@
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/content/shell_content_state.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/screen_layout_observer.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_environment_content.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/content/test_shell_content_state.h"
-#include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/command_line.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
@@ -31,7 +29,9 @@
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/display_switches.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
+#include "ui/display/test/display_manager_test_api.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/test/webview_test_helper.h"
 #include "ui/views/view.h"
@@ -424,7 +424,7 @@ TEST_F(ScreenOrientationControllerTest, BlockRotationNotifications) {
   Shell::GetInstance()
       ->screen_layout_observer()
       ->set_show_notifications_for_testing(true);
-  test::DisplayManagerTestApi(display_manager())
+  display::test::DisplayManagerTestApi(display_manager())
       .SetFirstDisplayAsInternalDisplay();
 
   message_center::MessageCenter* message_center =
@@ -477,7 +477,7 @@ TEST_F(ScreenOrientationControllerTest, BlockRotationNotifications) {
 // Tests that if a user has set a display rotation that it is restored upon
 // exiting maximize mode.
 TEST_F(ScreenOrientationControllerTest, ResetUserRotationUponExit) {
-  test::DisplayManagerTestApi(display_manager())
+  display::test::DisplayManagerTestApi(display_manager())
       .SetFirstDisplayAsInternalDisplay();
 
   SetInternalDisplayRotation(display::Display::ROTATE_90);
@@ -604,7 +604,7 @@ TEST_F(ScreenOrientationControllerTest, UserRotationLockDisallowsRotation) {
 // ready, that ScreenOrientationController still begins listening to events,
 // which require an internal display to be acted upon.
 TEST_F(ScreenOrientationControllerTest, InternalDisplayNotAvailableAtStartup) {
-  test::DisplayManagerTestApi(display_manager())
+  display::test::DisplayManagerTestApi(display_manager())
       .SetFirstDisplayAsInternalDisplay();
 
   int64_t internal_display_id = display::Display::InternalDisplayId();
@@ -651,8 +651,8 @@ TEST_F(ScreenOrientationControllerTest, RotateInactiveDisplay) {
   display_manager()->UpdateDisplaysWith(display_info_list_two_active);
   display_manager()->UpdateDisplaysWith(display_info_list_one_active);
 
-  test::ScopedSetInternalDisplayId set_internal(display_manager(),
-                                                kInternalDisplayId);
+  display::test::ScopedSetInternalDisplayId set_internal(display_manager(),
+                                                         kInternalDisplayId);
 
   ASSERT_NE(kNewRotation, display_manager()
                               ->GetDisplayInfo(kInternalDisplayId)

diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
@@ -8,7 +8,6 @@
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_md_test_base.h"
 #include "ash/wm/window_properties.h"
@@ -18,6 +17,7 @@
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/widget/widget.h"

diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc
@@ -4,7 +4,6 @@
 
 #include "ash/display/cursor_window_controller.h"
 
-#include "ash/display/display_manager.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ -19,6 +18,7 @@
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/dip_util.h"
@@ -127,7 +127,7 @@ void CursorWindowController::SetDisplay(const display::Display& display) {
   // TODO(oshima): Do not updatethe composition cursor when crossing
   // display in unified desktop mode for now. crbug.com/517222.
   if (Shell::GetInstance()->display_manager()->IsInUnifiedMode() &&
-      display.id() != DisplayManager::kUnifiedDisplayId) {
+      display.id() != display::DisplayManager::kUnifiedDisplayId) {
     return;
   }
 

diff --git a/ash/display/cursor_window_controller_unittest.cc b/ash/display/cursor_window_controller_unittest.cc
@@ -8,12 +8,12 @@
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
+#include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
@@ -156,14 +156,15 @@ TEST_F(CursorWindowControllerTest, DSF) {
   UpdateDisplay("1000x500*2");
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
 
-  test::ScopedSetInternalDisplayId set_internal(display_manager(), primary_id);
+  display::test::ScopedSetInternalDisplayId set_internal(display_manager(),
+                                                         primary_id);
   SetCursorCompositionEnabled(true);
   ASSERT_EQ(
       2.0f,
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_TRUE(GetCursorImage().HasRepresentation(2.0f));
 
-  ASSERT_TRUE(test::DisplayManagerTestApi(display_manager())
+  ASSERT_TRUE(display::test::DisplayManagerTestApi(display_manager())
                   .SetDisplayUIScale(primary_id, 2.0f));
   ASSERT_EQ(
       1.0f,

diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/shell.h"
 #include "ash/touch/touchscreen_util.h"
@@ -25,6 +24,7 @@
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_layout_store.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"

diff --git a/ash/display/display_configuration_controller.cc b/ash/display/display_configuration_controller.cc
@@ -5,11 +5,11 @@
 #include "ash/display/display_configuration_controller.h"
 
 #include "ash/display/display_animator.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "base/time/time.h"
 #include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_manager.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/display_animator_chromeos.h"
@@ -51,7 +51,7 @@ class DisplayConfigurationController::DisplayChangeLimiter {
 };
 
 DisplayConfigurationController::DisplayConfigurationController(
-    DisplayManager* display_manager,
+    display::DisplayManager* display_manager,
     WindowTreeHostManager* window_tree_host_manager)
     : display_manager_(display_manager),
       window_tree_host_manager_(window_tree_host_manager),

diff --git a/ash/display/display_configuration_controller.h b/ash/display/display_configuration_controller.h
@@ -15,6 +15,7 @@
 
 namespace display {
 class DisplayLayout;
+class DisplayManager;
 }
 
 namespace ash {
@@ -24,7 +25,6 @@ class ShellTestApi;
 }  // namespace test
 
 class DisplayAnimator;
-class DisplayManager;
 
 // This class controls Display related configuration. Specifically it:
 // * Handles animated transitions where appropriate.
@@ -35,7 +35,7 @@ class ASH_EXPORT DisplayConfigurationController
     : public WindowTreeHostManager::Observer {
  public:
   DisplayConfigurationController(
-      DisplayManager* display_manager,
+      display::DisplayManager* display_manager,
       WindowTreeHostManager* window_tree_host_manager);
   ~DisplayConfigurationController() override;
 
@@ -78,7 +78,7 @@ class ASH_EXPORT DisplayConfigurationController
   void SetMirrorModeImpl(bool mirror);
   void SetPrimaryDisplayIdImpl(int64_t display_id);
 
-  DisplayManager* display_manager_;                  // weak ptr
+  display::DisplayManager* display_manager_;         // weak ptr
   WindowTreeHostManager* window_tree_host_manager_;  // weak ptr
   std::unique_ptr<DisplayAnimator> display_animator_;
   std::unique_ptr<DisplayChangeLimiter> limiter_;