diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-06-15 18:51:21 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-07-02 10:31:10 +0000 |
| commit | ec127d7e4898940116be9fbbc8dc94b4cfa9b18c (patch) | |
| tree | af9dc33792e1948bdc7362925ab68f74ee9085a8 /src/core/content_browser_client_qt.h | |
| parent | 59b8f28d029e45ac3b3e95edda82e6607a880979 (diff) | |
Migrate from BUILDFLAG to QT_CONFIG
During configuration we mapped qt webengine fetures
to chromium ones and passed them to gn. We used BUILDFLAG to
optionally compile code in core. Use QT_CONFIG directly
for qt files and add config sanity checks to make
sure requested features are present.
Change-Id: I930df114ac9aec8e73139ea9135925fc3ad8e39c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.h')
| -rw-r--r-- | src/core/content_browser_client_qt.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 540774fab..6956bc736 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -40,11 +40,9 @@ #ifndef CONTENT_BROWSER_CLIENT_QT_H #define CONTENT_BROWSER_CLIENT_QT_H +#include "qtwebenginecoreglobal_p.h" #include "base/memory/ref_counted.h" #include "content/public/browser/content_browser_client.h" -#include "ppapi/buildflags/buildflags.h" - -#include <QtGlobal> namespace net { class URLRequestContextGetter; @@ -54,7 +52,7 @@ namespace content { class BrowserContext; class BrowserMainParts; -#if BUILDFLAG(ENABLE_PLUGINS) +#if QT_CONFIG(webengine_pepper_plugins) class BrowserPpapiHost; #endif @@ -177,7 +175,7 @@ public: void GetAdditionalMappedFilesForChildProcess(const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) override; #endif -#if BUILDFLAG(ENABLE_PLUGINS) +#if QT_CONFIG(webengine_pepper_plugins) void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override; #endif |