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

services/ui/display/platform_screen_ozone.h

 // 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.
 
 #ifndef SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
 #define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/ui/display/platform_screen.h"
 #include "services/ui/display/viewport_metrics.h"
 #include "services/ui/public/interfaces/display/display_controller.mojom.h"
 #include "services/ui/public/interfaces/display/test_display_controller.mojom.h"
-#include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/chromeos/display_configurator.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/display/types/fake_display_controller.h"
 
 namespace display {
 
 // PlatformScreenOzone provides the necessary functionality to configure all
 // attached physical displays on the ozone platform.
 class PlatformScreenOzone
     : public PlatformScreen,
       public ui::DisplayConfigurator::Observer,
@@ skipping 123 matching lines @@
 
   mojo::BindingSet<mojom::DisplayController> controller_bindings_;
   mojo::BindingSet<mojom::TestDisplayController> test_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformScreenOzone);
 };
 
 }  // namespace display
 
 #endif  // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_