Rename ScreeManagerOzone to ScreenManagerOzoneInternal

services/ui/display/screen_manager_ozone_internal.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_SCREEN_MANAGER_OZONE_H_
-#define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
+#ifndef SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_INTERNAL_H_
+#define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_INTERNAL_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #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/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"
 #include "ui/display/display.h"
 #include "ui/display/display_observer.h"
 #include "ui/display/manager/chromeos/display_configurator.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/types/display_constants.h"
 
 namespace display {
 
 class DisplayChangeObserver;
 class FakeDisplayController;
 class ScreenBase;
 class TouchTransformController;
 
-// ScreenManagerOzone provides the necessary functionality to configure all
+// ScreenManagerOzoneInternal provides the necessary functionality to configure
+// all
 // attached physical displays on the ozone platform.

[rjkroege, 2017/02/08 21:56:32]

before landing can you add "on the the ozone platform when operating in internal
window mode" or something similar?

[tonikitoo, 2017/02/08 23:39:39]

Done.

-class ScreenManagerOzone
+class ScreenManagerOzoneInternal
     : public ScreenManager,
       public mojom::TestDisplayController,
       public mojom::DisplayController,
       public DisplayObserver,
       public DisplayManager::Delegate,
       public service_manager::InterfaceFactory<mojom::DisplayController>,
       public service_manager::InterfaceFactory<mojom::TestDisplayController> {
  public:
-  ScreenManagerOzone();
-  ~ScreenManagerOzone() override;
+  ScreenManagerOzoneInternal();
+  ~ScreenManagerOzoneInternal() override;
 
   void SetPrimaryDisplayId(int64_t display_id);
 
   // ScreenManager:
   void AddInterfaces(service_manager::InterfaceRegistry* registry) override;
   void Init(ScreenManagerDelegate* delegate) override;
   void RequestCloseDisplay(int64_t display_id) override;
   int64_t GetPrimaryDisplayId() const override;
 
   // mojom::TestDisplayController:
   void ToggleAddRemoveDisplay() override;
   void ToggleDisplayResolution() override;
 
   // mojom::DisplayController:
   void IncreaseInternalDisplayZoom() override;
   void DecreaseInternalDisplayZoom() override;
   void ResetInternalDisplayZoom() override;
   void RotateCurrentDisplayCW() override;
   void SwapPrimaryDisplay() override;
   void ToggleMirrorMode() override;
   void SetDisplayWorkArea(int64_t display_id,
                           const gfx::Size& size,
                           const gfx::Insets& insets) override;
   void TakeDisplayControl(const TakeDisplayControlCallback& callback) override;
   void RelinquishDisplayControl(
       const RelinquishDisplayControlCallback& callback) override;
 
  private:
-  friend class ScreenManagerOzoneTest;
+  friend class ScreenManagerOzoneInternalTest;
 
   ViewportMetrics GetViewportMetricsForDisplay(const Display& display);
 
   // DisplayObserver:
   void OnDisplayAdded(const Display& new_display) override;
   void OnDisplayRemoved(const Display& old_display) override;
   void OnDisplayMetricsChanged(const Display& display,
                                uint32_t changed_metrics) override;
 
   // DisplayManager::Delegate:
@@ skipping 24 matching lines @@
 
   // If not null it provides a way to modify the display state when running off
   // device (eg. running mustash on Linux).
   FakeDisplayController* fake_display_controller_ = nullptr;
 
   int64_t primary_display_id_ = kInvalidDisplayId;
 
   mojo::BindingSet<mojom::DisplayController> controller_bindings_;
   mojo::BindingSet<mojom::TestDisplayController> test_bindings_;
 
-  DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzone);
+  DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzoneInternal);
 };
 
 }  // namespace display
 
-#endif  // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
+#endif  // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_INTERNAL_H_