Adaptations to Chromium 52

Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 11 insertions, 11 deletions

diff --git a/src/core/ozone_platform_eglfs.h b/src/core/ozone_platform_eglfs.h
index 2ab2298c0..cdc2bd1ce 100644
--- a/src/core/ozone_platform_eglfs.h
+++ b/src/core/ozone_platform_eglfs.h
@@ -61,27 +61,27 @@ class OzonePlatformEglfs : public OzonePlatform {
   virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() override;
   virtual GpuPlatformSupport* GetGpuPlatformSupport() override;
   virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override;
-  virtual scoped_ptr<PlatformWindow> CreatePlatformWindow(
+  virtual std::unique_ptr<PlatformWindow> CreatePlatformWindow(
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override;
-  virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate() override;
+  virtual std::unique_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate() override;
   virtual ui::InputController* GetInputController() override;
-  virtual scoped_ptr<ui::SystemInputInjector> CreateSystemInputInjector() override;
+  virtual std::unique_ptr<ui::SystemInputInjector> CreateSystemInputInjector() override;
   virtual ui::OverlayManagerOzone* GetOverlayManager() override;
 
  private:
   virtual void InitializeUI() override;
   virtual void InitializeGPU() override;
-  scoped_ptr<DeviceManager> device_manager_;
+  std::unique_ptr<DeviceManager> device_manager_;
 
-  scoped_ptr<QtWebEngineCore::SurfaceFactoryQt> surface_factory_ozone_;
-  scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
-  scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
+  std::unique_ptr<QtWebEngineCore::SurfaceFactoryQt> surface_factory_ozone_;
+  std::unique_ptr<CursorFactoryOzone> cursor_factory_ozone_;
+  std::unique_ptr<EventFactoryEvdev> event_factory_ozone_;
 
-  scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
-  scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
-  scoped_ptr<InputController> input_controller_;
-  scoped_ptr<OverlayManagerOzone> overlay_manager_;
+  std::unique_ptr<GpuPlatformSupport> gpu_platform_support_;
+  std::unique_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
+  std::unique_ptr<InputController> input_controller_;
+  std::unique_ptr<OverlayManagerOzone> overlay_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformEglfs);
 };