Adaptations for Chromium 59

Change-Id: I472053e316bfa782d0a6fb8903f4901be12247ae
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 11 insertions, 5 deletions

diff --git a/src/core/ozone_platform_qt.cpp b/src/core/ozone_platform_qt.cpp
index 20c1f43c8..e165239bd 100644
--- a/src/core/ozone_platform_qt.cpp
+++ b/src/core/ozone_platform_qt.cpp
@@ -99,6 +99,7 @@ public:
     // PlatformEventDispatcher:
     bool CanDispatchEvent(const PlatformEvent& event) override;
     uint32_t DispatchEvent(const PlatformEvent& event) override;
+    void PrepareForShutdown() override;
 
 private:
     PlatformWindowDelegate* delegate_;
@@ -134,6 +135,11 @@ uint32_t PlatformWindowQt::DispatchEvent(const ui::PlatformEvent& native_event)
     return ui::POST_DISPATCH_STOP_PROPAGATION;
 }
 
+void PlatformWindowQt::PrepareForShutdown()
+{
+}
+
+
 class OzonePlatformQt : public OzonePlatform {
 public:
     OzonePlatformQt();
@@ -149,8 +155,8 @@ public:
     ui::OverlayManagerOzone* GetOverlayManager() override;
 
 private:
-    void InitializeUI() override;
-    void InitializeGPU() override;
+    void InitializeUI(const ui::OzonePlatform::InitParams &) override;
+    void InitializeGPU(const ui::OzonePlatform::InitParams &) override;
 
     std::unique_ptr<QtWebEngineCore::SurfaceFactoryQt> surface_factory_ozone_;
     std::unique_ptr<CursorFactoryOzone> cursor_factory_ozone_;
@@ -208,7 +214,7 @@ std::unique_ptr<display::NativeDisplayDelegate> OzonePlatformQt::CreateNativeDis
     return nullptr;
 }
 
-void OzonePlatformQt::InitializeUI()
+void OzonePlatformQt::InitializeUI(const ui::OzonePlatform::InitParams &)
 {
     overlay_manager_.reset(new StubOverlayManager());
     cursor_factory_ozone_.reset(new CursorFactoryOzone());
@@ -216,7 +222,7 @@ void OzonePlatformQt::InitializeUI()
     input_controller_ = CreateStubInputController();
 }
 
-void OzonePlatformQt::InitializeGPU()
+void OzonePlatformQt::InitializeGPU(const ui::OzonePlatform::InitParams &)
 {
     surface_factory_ozone_.reset(new QtWebEngineCore::SurfaceFactoryQt());
 }
@@ -226,7 +232,7 @@ void OzonePlatformQt::InitializeGPU()
 
 OzonePlatform* CreateOzonePlatformQt() { return new OzonePlatformQt; }
 
-ClientNativePixmapFactory* CreateClientNativePixmapFactoryQt()
+gfx::ClientNativePixmapFactory* CreateClientNativePixmapFactoryQt()
 {
     return CreateStubClientNativePixmapFactory();
 }