Rename PlatformScreen to ScreenManager.

services/ui/display/screen_manager_ozone.h

Index: services/ui/display/screen_manager_ozone.h
diff --git a/services/ui/display/platform_screen_ozone.h b/services/ui/display/screen_manager_ozone.h
similarity index 90%
rename from services/ui/display/platform_screen_ozone.h
rename to services/ui/display/screen_manager_ozone.h
index 1033d1103177263d949ed01f0e663a30cf0c1099..0b4011b8eb4fb05b7a901cc197132bfabbb383ec 100644
--- a/services/ui/display/platform_screen_ozone.h
+++ b/services/ui/display/screen_manager_ozone.h
@@ -2,8 +2,8 @@
 // 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_
+#ifndef SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
+#define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
 
 #include <stdint.h>
 
@@ -15,7 +15,7 @@
 #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/screen_manager.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"
@@ -26,10 +26,10 @@
 
 namespace display {
 
-// PlatformScreenOzone provides the necessary functionality to configure all
+// ScreenManagerOzone provides the necessary functionality to configure all
 // attached physical displays on the ozone platform.
-class PlatformScreenOzone
-    : public PlatformScreen,
+class ScreenManagerOzone
+    : public ScreenManager,
       public ui::DisplayConfigurator::Observer,
       public ui::DisplayConfigurator::StateController,
       public service_manager::InterfaceFactory<mojom::DisplayController>,
@@ -37,12 +37,12 @@ class PlatformScreenOzone
       public mojom::DisplayController,
       public mojom::TestDisplayController {
  public:
-  PlatformScreenOzone();
-  ~PlatformScreenOzone() override;
+  ScreenManagerOzone();
+  ~ScreenManagerOzone() override;
 
-  // PlatformScreen:
+  // ScreenManager:
   void AddInterfaces(service_manager::InterfaceRegistry* registry) override;
-  void Init(PlatformScreenDelegate* delegate) override;
+  void Init(ScreenManagerDelegate* delegate) override;
   void RequestCloseDisplay(int64_t display_id) override;
   int64_t GetPrimaryDisplayId() const override;
 
@@ -57,7 +57,7 @@ class PlatformScreenOzone
                           const gfx::Insets& insets) override;
 
  private:
-  friend class PlatformScreenOzoneTest;
+  friend class ScreenManagerOzoneTest;
 
   // TODO(kylechar): This struct is just temporary until we migrate
   // DisplayManager code out of ash so it can be used here.
@@ -140,7 +140,7 @@ class PlatformScreenOzone
               mojom::TestDisplayControllerRequest request) override;
 
   ui::DisplayConfigurator display_configurator_;
-  PlatformScreenDelegate* delegate_ = nullptr;
+  ScreenManagerDelegate* delegate_ = nullptr;
 
   // If not null it provides a way to modify the display state when running off
   // device (eg. running mustash on Linux).
@@ -158,9 +158,9 @@ class PlatformScreenOzone
   mojo::BindingSet<mojom::DisplayController> controller_bindings_;
   mojo::BindingSet<mojom::TestDisplayController> test_bindings_;
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformScreenOzone);
+  DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzone);
 };
 
 }  // namespace display
 
-#endif  // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
+#endif  // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_