From 515684072272902ce6be636eb70b64cf732574fc Mon Sep 17 00:00:00 2001
From: Michael Bruning <michael.bruning@theqtcompany.com>
Date: Mon, 2 Nov 2015 09:44:39 +0100
Subject: Add dummy implementations for new pure virtuals.

The missing implementation made the merge from 5.6 fail.

Change-Id: I974e71c276e3b103f217aa06f0d9a7d5b9313ac8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
 src/core/ozone_platform_eglfs.cpp | 8 +++++++-
 src/core/ozone_platform_eglfs.h   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/core/ozone_platform_eglfs.cpp b/src/core/ozone_platform_eglfs.cpp
index 834e41fdf..54b0a3ae0 100644
--- a/src/core/ozone_platform_eglfs.cpp
+++ b/src/core/ozone_platform_eglfs.cpp
@@ -88,6 +88,7 @@ public:
     void Show() override { }
     void Hide() override { }
     void Close() override { }
+    void SetTitle(const base::string16&) override { }
     void SetCapture() override { }
     void ReleaseCapture() override { }
     void ToggleFullscreen() override { }
@@ -97,7 +98,7 @@ public:
     void SetCursor(PlatformCursor) override { }
     void MoveCursorTo(const gfx::Point&) override { }
     void ConfineCursorToBounds(const gfx::Rect&) override { }
-
+    PlatformImeController* GetPlatformImeController() override { return nullptr; }
     // PlatformEventDispatcher:
     bool CanDispatchEvent(const PlatformEvent& event) override;
     uint32_t DispatchEvent(const PlatformEvent& event) override;
@@ -179,6 +180,11 @@ scoped_ptr<ui::NativeDisplayDelegate> OzonePlatformEglfs::CreateNativeDisplayDel
     return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
 }
 
+base::ScopedFD OzonePlatformEglfs::OpenClientNativePixmapDevice()
+{
+    return base::ScopedFD();
+}
+
 OzonePlatform* CreateOzonePlatformEglfs() { return new OzonePlatformEglfs; }
 
 void OzonePlatformEglfs::InitializeUI() {
diff --git a/src/core/ozone_platform_eglfs.h b/src/core/ozone_platform_eglfs.h
index 69ff2508f..d898ff371 100644
--- a/src/core/ozone_platform_eglfs.h
+++ b/src/core/ozone_platform_eglfs.h
@@ -62,6 +62,7 @@ class OzonePlatformEglfs : public OzonePlatform {
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override;
   virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate() override;
+  virtual base::ScopedFD OpenClientNativePixmapDevice() override;
   virtual ui::InputController* GetInputController() override;
   virtual scoped_ptr<ui::SystemInputInjector> CreateSystemInputInjector() override;
   virtual ui::OverlayManagerOzone* GetOverlayManager() override;
-- 
cgit v1.2.3