diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-09 17:25:22 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-26 08:17:30 +0000 |
| commit | 7757ec1a562ae36b65a6cae93b3cd308247755ef (patch) | |
| tree | 9da058ac021019317111dd1ad90c0a4a32529afe /src/core/chromium_overrides.cpp | |
| parent | 57c49df9c6fcbaaffc66900e191312d4e0a0edfa (diff) | |
Adaptations for Chromium 67
Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
| -rw-r--r-- | src/core/chromium_overrides.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 8f6687ff3..23e4ae235 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -51,7 +51,7 @@ #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" #include "ui/events/devices/device_data_manager.h" #include "ui/events/platform/platform_event_source.h" -#include "ppapi/features/features.h" +#include "ppapi/buildflags/buildflags.h" #include <QGuiApplication> #include <QScreen> @@ -111,7 +111,7 @@ public: }; std::unique_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() { - return base::MakeUnique<DummyPlatformEventSource>(); + return std::make_unique<DummyPlatformEventSource>(); } } // namespace ui #endif // defined(USE_X11) @@ -196,14 +196,3 @@ std::unique_ptr<ui::OSExchangeData::Provider> ui::OSExchangeDataProviderFactory::CreateProvider() { return nullptr; } - -#if defined(USE_OPENSSL_CERTS) -namespace net { - -scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(const X509Certificate* certificate) -{ - return OpenSSLClientKeyStore::GetInstance()->FetchClientCertPrivateKey(certificate); -} - -} // namespace net -#endif |