Split //ui/display and create //ui/display/manager.

ui/display/manager/chromeos/display_configurator.cc

Index: ui/display/manager/chromeos/display_configurator.cc
diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/manager/chromeos/display_configurator.cc
similarity index 97%
rename from ui/display/chromeos/display_configurator.cc
rename to ui/display/manager/chromeos/display_configurator.cc
index 7ac77023a44e3fdc9d3cd3a2b51a847708c10041..8258d23d29eaddcb40e5c3807cd4e73e448b1dce 100644
--- a/ui/display/chromeos/display_configurator.cc
+++ b/ui/display/manager/chromeos/display_configurator.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/display/chromeos/display_configurator.h"
+#include "ui/display/manager/chromeos/display_configurator.h"
 
 #include <stddef.h>
 #include <utility>
@@ -13,13 +13,13 @@
 #include "base/macros.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
-#include "ui/display/chromeos/apply_content_protection_task.h"
-#include "ui/display/chromeos/display_layout_manager.h"
-#include "ui/display/chromeos/display_snapshot_virtual.h"
-#include "ui/display/chromeos/display_util.h"
-#include "ui/display/chromeos/update_display_configuration_task.h"
 #include "ui/display/display.h"
 #include "ui/display/display_switches.h"
+#include "ui/display/manager/chromeos/apply_content_protection_task.h"
+#include "ui/display/manager/chromeos/display_layout_manager.h"
+#include "ui/display/manager/chromeos/display_snapshot_virtual.h"
+#include "ui/display/manager/chromeos/display_util.h"
+#include "ui/display/manager/chromeos/update_display_configuration_task.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/native_display_delegate.h"
@@ -44,15 +44,14 @@ struct DisplayState {
   const DisplayMode* mirror_mode = nullptr;
 };
 
-void DoNothing(bool status) {
-}
+void DoNothing(bool status) {}
 
 }  // namespace
 
 const int DisplayConfigurator::kSetDisplayPowerNoFlags = 0;
 const int DisplayConfigurator::kSetDisplayPowerForceProbe = 1 << 0;
-const int
-DisplayConfigurator::kSetDisplayPowerOnlyIfSingleInternalDisplay = 1 << 1;
+const int DisplayConfigurator::kSetDisplayPowerOnlyIfSingleInternalDisplay =
+    1 << 1;
 
 bool DisplayConfigurator::TestApi::TriggerConfigureTimeout() {
   if (configurator_->configure_timer_.IsRunning()) {
@@ -126,11 +125,9 @@ class DisplayConfigurator::DisplayLayoutManagerImpl
 
 DisplayConfigurator::DisplayLayoutManagerImpl::DisplayLayoutManagerImpl(
     DisplayConfigurator* configurator)
-    : configurator_(configurator) {
-}
+    : configurator_(configurator) {}
 
-DisplayConfigurator::DisplayLayoutManagerImpl::~DisplayLayoutManagerImpl() {
-}
+DisplayConfigurator::DisplayLayoutManagerImpl::~DisplayLayoutManagerImpl() {}
 
 DisplayConfigurator::SoftwareMirroringController*
 DisplayConfigurator::DisplayLayoutManagerImpl::GetSoftwareMirroringController()
@@ -413,7 +410,7 @@ bool DisplayConfigurator::DisplayLayoutManagerImpl::FindMirrorMode(
             *internal_display->display, external_mode.get());
         internal_display->display->add_mode(external_mode.get());
         internal_display->mirror_mode =
-          internal_display->display->modes().back().get();
+            internal_display->display->modes().back().get();
         external_display->mirror_mode = external_mode.get();
         return true;  // Mirror mode created.
       }
@@ -483,8 +480,7 @@ DisplayConfigurator::DisplayConfigurator()
       display_control_changing_(false),
       displays_suspended_(false),
       layout_manager_(new DisplayLayoutManagerImpl(this)),
-      weak_ptr_factory_(this) {
-}
+      weak_ptr_factory_(this) {}
 
 DisplayConfigurator::~DisplayConfigurator() {
   if (native_display_delegate_)
@@ -596,7 +592,8 @@ void DisplayConfigurator::RelinquishControl(
 }
 
 void DisplayConfigurator::SendRelinquishDisplayControl(
-    const DisplayControlCallback& callback, bool success) {
+    const DisplayControlCallback& callback,
+    bool success) {
   if (success) {
     // Set the flag early such that an incoming configuration event won't start
     // while we're releasing control of the displays.
@@ -1032,9 +1029,9 @@ void DisplayConfigurator::RunPendingConfiguration() {
 
   configuration_task_.reset(new UpdateDisplayConfigurationTask(
       native_display_delegate_.get(), layout_manager_.get(),
-      requested_display_state_, pending_power_state_, pending_power_flags_,
-      0, force_configure_, base::Bind(&DisplayConfigurator::OnConfigured,
-                                      weak_ptr_factory_.GetWeakPtr())));
+      requested_display_state_, pending_power_state_, pending_power_flags_, 0,
+      force_configure_, base::Bind(&DisplayConfigurator::OnConfigured,
+                                   weak_ptr_factory_.GetWeakPtr())));
   configuration_task_->set_virtual_display_snapshots(
       virtual_display_snapshots_.get());