Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/display/display_configuration_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_configuration_controller.h"
 
 #include "ash/display/display_animator.h"
-#include "ash/display/display_layout.h"
 #include "ash/display/display_manager.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/screen_util.h"
 #include "base/time/time.h"
+#include "ui/display/manager/display_layout.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/display_animator_chromeos.h"
 #include "base/sys_info.h"
 #endif
 
 namespace {
 
 // Specifies how long the display change should have been disabled
 // after each display change operations.
@@ skipping 38 matching lines @@
     limiter_.reset(new DisplayChangeLimiter);
   display_animator_.reset(new DisplayAnimatorChromeOS());
 #endif
 }
 
 DisplayConfigurationController::~DisplayConfigurationController() {
   window_tree_host_manager_->RemoveObserver(this);
 }
 
 void DisplayConfigurationController::SetDisplayLayout(
-    scoped_ptr<DisplayLayout> layout,
+    scoped_ptr<display::DisplayLayout> layout,
     bool user_action) {
   if (user_action && display_animator_) {
     display_animator_->StartFadeOutAnimation(
         base::Bind(&DisplayConfigurationController::SetDisplayLayoutImpl,
                    weak_ptr_factory_.GetWeakPtr(), base::Passed(&layout)));
   } else {
     SetDisplayLayoutImpl(std::move(layout));
   }
 }
 
@@ skipping 58 matching lines @@
 void DisplayConfigurationController::SetThrottleTimeout(int64_t throttle_ms) {
   if (limiter_)
     limiter_->SetThrottleTimeout(throttle_ms);
 }
 
 bool DisplayConfigurationController::IsLimited() {
   return limiter_ && limiter_->IsThrottled();
 }
 
 void DisplayConfigurationController::SetDisplayLayoutImpl(
-    scoped_ptr<DisplayLayout> layout) {
+    scoped_ptr<display::DisplayLayout> layout) {
   // TODO(oshima/stevenjb): Add support for 3+ displays.
   display_manager_->SetLayoutForCurrentDisplays(std::move(layout));
   if (display_animator_)
     display_animator_->StartFadeInAnimation();
 }
 
 void DisplayConfigurationController::SetMirrorModeImpl(bool mirror) {
   display_manager_->SetMirrorMode(mirror);
   if (display_animator_)
     display_animator_->StartFadeInAnimation();
 }
 
 void DisplayConfigurationController::SetPrimaryDisplayIdImpl(
     int64_t display_id) {
   window_tree_host_manager_->SetPrimaryDisplayId(display_id);
   if (display_animator_)
     display_animator_->StartFadeInAnimation();
 }
 
 }  // namespace ash