diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-18 13:01:18 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-18 13:01:18 +0200 |
| commit | ecc40a888c56bc529cea05a5501dd849c5d572c1 (patch) | |
| tree | 2991d2188aae76632993682d272534e06605bb10 /src/core/content_browser_client_qt.h | |
| parent | 216f19d52ce9e920349da9247afc2c8e85df2c56 (diff) | |
| parent | 9233ac4b4cd22da400b0c94ca13b334c562582b9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id171407c17533846e8efe0e586d6793a61543438
Diffstat (limited to 'src/core/content_browser_client_qt.h')
| -rw-r--r-- | src/core/content_browser_client_qt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 042de5c8c..515574147 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -168,6 +168,8 @@ public: content::ResourceContext *context, const std::vector<std::pair<int, int> > &render_frames) override; + std::unique_ptr<device::LocationProvider> OverrideSystemLocationProvider() override; + void GetGeolocationRequestContext(base::OnceCallback<void(scoped_refptr<net::URLRequestContextGetter>)> callback) override; #if defined(Q_OS_LINUX) void GetAdditionalMappedFilesForChildProcess(const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) override; #endif |