From ec24f4ff4e3e4d4cbbe1d6a91ff8d40e587b4bf6 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Mon, 2 Nov 2015 16:19:17 +0100
Subject: Implement missing stubs for embedded linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds stub implementations of methods needed in the embedded linux
configuration. Also fixes OpenSSL desktop linux build.

Change-Id: Icf4b9a24f7a83bb171d29a8c4693c72cd321eb94
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 src/core/chromium_overrides.cpp   | 13 +++++++++++++
 src/core/ozone_platform_eglfs.cpp |  5 +++++
 2 files changed, 18 insertions(+)

(limited to 'src')

diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index b9ce722dd..98807e387 100644
--- a/src/core/chromium_overrides.cpp
+++ b/src/core/chromium_overrides.cpp
@@ -157,3 +157,16 @@ OSExchangeData::Provider* OSExchangeData::CreateProvider()
 } // namespace ui
 
 #endif // defined(USE_AURA) && !defined(USE_OZONE)
+
+#if defined(USE_OPENSSL_CERTS)
+namespace net {
+class SSLPrivateKey { };
+class X509Certificate;
+
+scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey(X509Certificate* certificate, scoped_refptr<base::SequencedTaskRunner> task_runner)
+{
+    return scoped_ptr<SSLPrivateKey>();
+}
+
+}  // namespace net
+#endif
diff --git a/src/core/ozone_platform_eglfs.cpp b/src/core/ozone_platform_eglfs.cpp
index 54b0a3ae0..726f779e8 100644
--- a/src/core/ozone_platform_eglfs.cpp
+++ b/src/core/ozone_platform_eglfs.cpp
@@ -45,6 +45,7 @@
 #include "ui/events/ozone/events_ozone.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/ozone/common/native_display_delegate_ozone.h"
+#include "ui/ozone/common/stub_client_native_pixmap_factory.h"
 #include "ui/ozone/common/stub_overlay_manager.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
@@ -187,6 +188,10 @@ base::ScopedFD OzonePlatformEglfs::OpenClientNativePixmapDevice()
 
 OzonePlatform* CreateOzonePlatformEglfs() { return new OzonePlatformEglfs; }
 
+ClientNativePixmapFactory* CreateClientNativePixmapFactoryEglfs() {
+  return CreateStubClientNativePixmapFactory();
+}
+
 void OzonePlatformEglfs::InitializeUI() {
   overlay_manager_.reset(new StubOverlayManager());
   device_manager_ = CreateDeviceManager();
-- 
cgit v1.2.1