Rename PlatformScreen implementations.

Improve naming of PlatformScreen implementations.

BUG=none

Review-Url: https://codereview.chromium.org/2317073003
Cr-Commit-Position: refs/heads/master@{#417036}

services/ui/display/BUILD.gn

@@ -19,18 +19,18 @@ source_set("display") {
 
   if (use_ozone && is_chromeos) {
     sources += [
-      "platform_screen_impl_ozone.cc",
-      "platform_screen_impl_ozone.h",
+      "platform_screen_ozone.cc",
+      "platform_screen_ozone.h",
     ]
 
     deps += [
       "//skia",
-      "//ui/ozone:ozone",
+      "//ui/ozone",
     ]
   } else {
     sources += [
-      "platform_screen_impl.cc",
-      "platform_screen_impl.h",
+      "platform_screen_stub.cc",
+      "platform_screen_stub.h",
     ]
   }
 }

services/ui/display/platform_screen_impl_ozone.cc → services/ui/display/platform_screen_ozone.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 "services/ui/display/platform_screen_impl_ozone.h"
+#include "services/ui/display/platform_screen_ozone.h"
 
 #include <memory>
 
@@ -27,16 +27,16 @@ const SkColor kChromeOsBootColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
 
 // static
 std::unique_ptr<PlatformScreen> PlatformScreen::Create() {
-  return base::MakeUnique<PlatformScreenImplOzone>();
+  return base::MakeUnique<PlatformScreenOzone>();
 }
 
-PlatformScreenImplOzone::PlatformScreenImplOzone() {}
+PlatformScreenOzone::PlatformScreenOzone() {}
 
-PlatformScreenImplOzone::~PlatformScreenImplOzone() {
+PlatformScreenOzone::~PlatformScreenOzone() {
   display_configurator_.RemoveObserver(this);
 }
 
-void PlatformScreenImplOzone::Init(PlatformScreenDelegate* delegate) {
+void PlatformScreenOzone::Init(PlatformScreenDelegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
 
@@ -60,11 +60,11 @@ void PlatformScreenImplOzone::Init(PlatformScreenDelegate* delegate) {
   }
 }
 
-int64_t PlatformScreenImplOzone::GetPrimaryDisplayId() const {
+int64_t PlatformScreenOzone::GetPrimaryDisplayId() const {
   return primary_display_id_;
 }
 
-void PlatformScreenImplOzone::ProcessRemovedDisplays(
+void PlatformScreenOzone::ProcessRemovedDisplays(
     const ui::DisplayConfigurator::DisplayStateList& snapshots) {
   std::vector<int64_t> current_ids;
   for (ui::DisplaySnapshot* snapshot : snapshots)
@@ -91,7 +91,7 @@ void PlatformScreenImplOzone::ProcessRemovedDisplays(
   }
 }
 
-void PlatformScreenImplOzone::ProcessModifiedDisplays(
+void PlatformScreenOzone::ProcessModifiedDisplays(
     const ui::DisplayConfigurator::DisplayStateList& snapshots) {
   for (ui::DisplaySnapshot* snapshot : snapshots) {
     auto iter = GetCachedDisplayIterator(snapshot->display_id());
@@ -106,7 +106,7 @@ void PlatformScreenImplOzone::ProcessModifiedDisplays(
   }
 }
 
-void PlatformScreenImplOzone::UpdateCachedDisplays() {
+void PlatformScreenOzone::UpdateCachedDisplays() {
   // Walk through cached displays after processing the snapshots to find any
   // removed or modified displays. This ensures that we only send one update per
   // display to the delegate.
@@ -135,7 +135,7 @@ void PlatformScreenImplOzone::UpdateCachedDisplays() {
   }
 }
 
-void PlatformScreenImplOzone::AddNewDisplays(
+void PlatformScreenOzone::AddNewDisplays(
     const ui::DisplayConfigurator::DisplayStateList& snapshots) {
   for (ui::DisplaySnapshot* snapshot : snapshots) {
     const int64_t id = snapshot->display_id();
@@ -159,15 +159,15 @@ void PlatformScreenImplOzone::AddNewDisplays(
   }
 }
 
-PlatformScreenImplOzone::CachedDisplayIterator
-PlatformScreenImplOzone::GetCachedDisplayIterator(int64_t display_id) {
+PlatformScreenOzone::CachedDisplayIterator
+PlatformScreenOzone::GetCachedDisplayIterator(int64_t display_id) {
   return std::find_if(cached_displays_.begin(), cached_displays_.end(),
                       [display_id](const DisplayInfo& display_info) {
                         return display_info.id == display_id;
                       });
 }
 
-void PlatformScreenImplOzone::OnDisplayModeChanged(
+void PlatformScreenOzone::OnDisplayModeChanged(
     const ui::DisplayConfigurator::DisplayStateList& displays) {
   ProcessRemovedDisplays(displays);
   ProcessModifiedDisplays(displays);
@@ -175,7 +175,7 @@ void PlatformScreenImplOzone::OnDisplayModeChanged(
   AddNewDisplays(displays);
 }
 
-void PlatformScreenImplOzone::OnDisplayModeChangeFailed(
+void PlatformScreenOzone::OnDisplayModeChangeFailed(
     const ui::DisplayConfigurator::DisplayStateList& displays,
     ui::MultipleDisplayState failed_new_state) {
   LOG(ERROR) << "OnDisplayModeChangeFailed from DisplayConfigurator";

services/ui/display/platform_screen_impl_ozone.h → services/ui/display/platform_screen_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_IMPL_OZONE_H_
-#define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_IMPL_OZONE_H_
+#ifndef SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
+#define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
 
 #include <stdint.h>
 
@@ -18,13 +18,13 @@
 
 namespace display {
 
-// PlatformScreenImplOzone provides the necessary functionality to configure all
+// PlatformScreenOzone provides the necessary functionality to configure all
 // attached physical displays on the ozone platform.
-class PlatformScreenImplOzone : public PlatformScreen,
-                                public ui::DisplayConfigurator::Observer {
+class PlatformScreenOzone : public PlatformScreen,
+                            public ui::DisplayConfigurator::Observer {
  public:
-  PlatformScreenImplOzone();
-  ~PlatformScreenImplOzone() override;
+  PlatformScreenOzone();
+  ~PlatformScreenOzone() override;
 
   // PlatformScreen:
   void Init(PlatformScreenDelegate* delegate) override;
@@ -92,9 +92,9 @@ class PlatformScreenImplOzone : public PlatformScreen,
   std::vector<DisplayInfo> cached_displays_;
   gfx::Point next_display_origin_;
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformScreenImplOzone);
+  DISALLOW_COPY_AND_ASSIGN(PlatformScreenOzone);
 };
 
 }  // namespace display
 
-#endif  // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_IMPL_OZONE_H_
+#endif  // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_

services/ui/display/platform_screen_ozone_unittests.cc

@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/display/platform_screen.h"
-#include "services/ui/display/platform_screen_impl_ozone.h"
+#include "services/ui/display/platform_screen_ozone.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_configurator.h"
@@ -101,7 +101,7 @@ class TestPlatformScreenDelegate : public PlatformScreenDelegate {
 };
 
 // Test fixture with helpers to act like ui::DisplayConfigurator and send
-// OnDisplayModeChanged() to PlatformScreenImplOzone.
+// OnDisplayModeChanged() to PlatformScreenOzone.
 class PlatformScreenOzoneTest : public testing::Test {
  public:
   PlatformScreenOzoneTest() {}
@@ -170,7 +170,7 @@ class PlatformScreenOzoneTest : public testing::Test {
   void SetUp() override {
     testing::Test::SetUp();
     ui::OzonePlatform::InitializeForUI();
-    platform_screen_ = base::MakeUnique<PlatformScreenImplOzone>();
+    platform_screen_ = base::MakeUnique<PlatformScreenOzone>();
     platform_screen_->Init(&delegate_);
 
     // Double check the expected display exists and clear counters.
@@ -191,7 +191,7 @@ class PlatformScreenOzoneTest : public testing::Test {
   }
 
   TestPlatformScreenDelegate delegate_;
-  std::unique_ptr<PlatformScreenImplOzone> platform_screen_;
+  std::unique_ptr<PlatformScreenOzone> platform_screen_;
   std::vector<std::unique_ptr<DisplaySnapshot>> snapshots_;
 };
 

services/ui/display/platform_screen_impl.cc → services/ui/display/platform_screen_stub.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 "services/ui/display/platform_screen_impl.h"
+#include "services/ui/display/platform_screen_stub.h"
 
 #include <memory>
 
@@ -21,26 +21,26 @@ const int64_t kDisplayId = 1;
 
 // static
 std::unique_ptr<PlatformScreen> PlatformScreen::Create() {
-  return base::MakeUnique<PlatformScreenImpl>();
+  return base::MakeUnique<PlatformScreenStub>();
 }
 
-PlatformScreenImpl::PlatformScreenImpl() : weak_ptr_factory_(this) {}
+PlatformScreenStub::PlatformScreenStub() : weak_ptr_factory_(this) {}
 
-PlatformScreenImpl::~PlatformScreenImpl() {}
+PlatformScreenStub::~PlatformScreenStub() {}
 
-void PlatformScreenImpl::FixedSizeScreenConfiguration() {
+void PlatformScreenStub::FixedSizeScreenConfiguration() {
   delegate_->OnDisplayAdded(this, kDisplayId, gfx::Rect(1024, 768));
 }
 
-void PlatformScreenImpl::Init(PlatformScreenDelegate* delegate) {
+void PlatformScreenStub::Init(PlatformScreenDelegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&PlatformScreenImpl::FixedSizeScreenConfiguration,
+      FROM_HERE, base::Bind(&PlatformScreenStub::FixedSizeScreenConfiguration,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
-int64_t PlatformScreenImpl::GetPrimaryDisplayId() const {
+int64_t PlatformScreenStub::GetPrimaryDisplayId() const {
   return kDisplayId;
 }
 

services/ui/display/platform_screen_impl.h → services/ui/display/platform_screen_stub.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_IMPL_H_
-#define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_IMPL_H_
+#ifndef SERVICES_UI_DISPLAY_PLATFORM_SCREEN_STUB_H_
+#define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_STUB_H_
 
 #include <stdint.h>
 
@@ -13,12 +13,12 @@
 
 namespace display {
 
-// PlatformScreenImpl provides the necessary functionality to configure all
-// attached physical displays on non-ozone platforms.
-class PlatformScreenImpl : public PlatformScreen {
+// PlatformScreenStub provides the necessary functionality to configure a fixed
+// 1024x768 display for non-ozone platforms.
+class PlatformScreenStub : public PlatformScreen {
  public:
-  PlatformScreenImpl();
-  ~PlatformScreenImpl() override;
+  PlatformScreenStub();
+  ~PlatformScreenStub() override;
 
  private:
   // Fake creation of a single 1024x768 display.
@@ -30,11 +30,11 @@ class PlatformScreenImpl : public PlatformScreen {
 
   PlatformScreenDelegate* delegate_ = nullptr;
 
-  base::WeakPtrFactory<PlatformScreenImpl> weak_ptr_factory_;
+  base::WeakPtrFactory<PlatformScreenStub> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformScreenImpl);
+  DISALLOW_COPY_AND_ASSIGN(PlatformScreenStub);
 };
 
 }  // namespace display
 
-#endif  // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_IMPL_H_
+#endif  // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_STUB_H_