diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 16:49:15 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-17 15:22:28 +0100 |
| commit | 1f7c5244e3adeccf42f0583358f0787498f2661b (patch) | |
| tree | 4b8a03628682f3d6bd847c09d8cf415dce7c6c48 /src/core/extensions/extension_web_contents_observer_qt.h | |
| parent | 8412b9b3442345b17fe6618a56ed9ed08dfb7417 (diff) | |
| parent | 6025803547477884fe1d027b7cb54a70429337c6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Blacklists tst_Accessibility::focusChild() for now.
Conflicts:
src/core/api/core_api.pro
src/core/net/plugin_response_interceptor_url_loader_throttle.h
src/process/process.pro
Change-Id: I95821a3851120dc16673f4c760e802952eae5c41
Diffstat (limited to 'src/core/extensions/extension_web_contents_observer_qt.h')
| -rw-r--r-- | src/core/extensions/extension_web_contents_observer_qt.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/extensions/extension_web_contents_observer_qt.h b/src/core/extensions/extension_web_contents_observer_qt.h index a528b3856..658966b31 100644 --- a/src/core/extensions/extension_web_contents_observer_qt.h +++ b/src/core/extensions/extension_web_contents_observer_qt.h @@ -59,9 +59,6 @@ public: static void CreateForWebContents(content::WebContents *web_contents); - std::string GetExtensionIdFromFrame(content::RenderFrameHost *) const; - const Extension *GetExtensionFromFrame(content::RenderFrameHost *, bool) const; - // content::WebContentsObserver overrides. void RenderFrameCreated(content::RenderFrameHost *render_frame_host) override; |