diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-22 22:10:41 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-22 22:10:41 +0000 |
| commit | 7430a9dae01f8d77a7fbbf163327ea65894cf8bb (patch) | |
| tree | 1e7904a220ec809b83d2c0584bd3c5407a51d05a /src/core/content_browser_client_qt.h | |
| parent | f65c5fc155c9f6c3f880389a57b7652614627654 (diff) | |
| parent | 34cd9bb6006b854ef8029448be10822b14a2b7ac (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src/core/content_browser_client_qt.h')
| -rw-r--r-- | src/core/content_browser_client_qt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 4d25ddf6a..b2761b311 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -118,6 +118,7 @@ public: const std::string& interface_name, mojo::ScopedMessagePipeHandle interface_pipe) override; void RegisterInProcessServices(StaticServiceMap* services, content::ServiceManagerConnection* connection) override; + void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override; std::vector<ServiceManifestInfo> GetExtraServiceManifests() override; std::unique_ptr<base::Value> GetServiceManifestOverlay(base::StringPiece name) override; bool CanCreateWindow( |