diff options
| author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-06-12 10:00:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-12 17:01:58 +0000 |
| commit | 92503bacf38b62d3fca8a4abe74ed78b063dd2e5 (patch) | |
| tree | b5ab4581cfb0e3cfaffa85c08d34d271c2e24068 /extensions/browser/extension_web_contents_observer.cc | |
| parent | 32ef655504fc0d3ac78223cab669baa32e6118db (diff) | |
| download | chromium_src-92503bacf38b62d3fca8a4abe74ed78b063dd2e5.zip chromium_src-92503bacf38b62d3fca8a4abe74ed78b063dd2e5.tar.gz chromium_src-92503bacf38b62d3fca8a4abe74ed78b063dd2e5.tar.bz2 | |
[Extensions OOPI] Convert extension functions to use RenderFrameHosts
Make ExtensionHostMsg_Request/Response send to RenderFrameHosts/RenderFrames
so that OOPI work with extension api calls.
Also update ExtensionFunctions to only have RenderFrameHosts set, and remove
the |render_view_host_| parameter, and update ExtensionFunction's
internals to use RenderFrameHost.
Note that this doesn't update all the uses of
ExtensionFunction::render_view_host() (of which there are 100+).
BUG=498017
Review URL: https://codereview.chromium.org/1182493002
Cr-Commit-Position: refs/heads/master@{#334185}
Diffstat (limited to 'extensions/browser/extension_web_contents_observer.cc')
| -rw-r--r-- | extensions/browser/extension_web_contents_observer.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/extensions/browser/extension_web_contents_observer.cc b/extensions/browser/extension_web_contents_observer.cc index 779f9a0..7ba4448 100644 --- a/extensions/browser/extension_web_contents_observer.cc +++ b/extensions/browser/extension_web_contents_observer.cc @@ -125,9 +125,11 @@ void ExtensionWebContentsObserver::RenderFrameCreated( } bool ExtensionWebContentsObserver::OnMessageReceived( - const IPC::Message& message) { + const IPC::Message& message, + content::RenderFrameHost* render_frame_host) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP(ExtensionWebContentsObserver, message) + IPC_BEGIN_MESSAGE_MAP_WITH_PARAM( + ExtensionWebContentsObserver, message, render_frame_host) IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -214,8 +216,9 @@ std::string ExtensionWebContentsObserver::GetExtensionId( } void ExtensionWebContentsObserver::OnRequest( + content::RenderFrameHost* render_frame_host, const ExtensionHostMsg_Request_Params& params) { - dispatcher_.Dispatch(params, web_contents()->GetRenderViewHost()); + dispatcher_.Dispatch(params, render_frame_host); } } // namespace extensions |