| Index: extensions/browser/extension_function.h
|
| ===================================================================
|
| --- extensions/browser/extension_function.h (revision 242033)
|
| +++ extensions/browser/extension_function.h (working copy)
|
| @@ -35,6 +35,7 @@
|
|
|
| namespace content {
|
| class BrowserContext;
|
| +class RenderFrameHost;
|
| class RenderViewHost;
|
| class WebContents;
|
| }
|
| @@ -290,7 +291,7 @@
|
|
|
| // Called when a message was received.
|
| // Should return true if it processed the message.
|
| - virtual bool OnMessageReceivedFromRenderView(const IPC::Message& message);
|
| + virtual bool OnMessageReceived(const IPC::Message& message);
|
|
|
| // Set the browser context which contains the extension that has originated
|
| // this function call.
|
| @@ -301,6 +302,10 @@
|
| content::RenderViewHost* render_view_host() const {
|
| return render_view_host_;
|
| }
|
| + void SetRenderFrameHost(content::RenderFrameHost* render_frame_host);
|
| + content::RenderFrameHost* render_frame_host() const {
|
| + return render_frame_host_;
|
| + }
|
|
|
| void set_dispatcher(
|
| const base::WeakPtr<ExtensionFunctionDispatcher>& dispatcher) {
|
| @@ -333,15 +338,20 @@
|
| // The RenderViewHost we will send responses too.
|
| content::RenderViewHost* render_view_host_;
|
|
|
| + // The RenderFrameHost we will send responses too.
|
| + // NOTE: either render_view_host_ or render_frame_host_ will be set, as we
|
| + // port code to use RenderFrames for OOPIF. See http://crbug.com/304341.
|
| + content::RenderFrameHost* render_frame_host_;
|
| +
|
| // The content::BrowserContext of this function's extension.
|
| content::BrowserContext* context_;
|
|
|
| private:
|
| - class RenderViewHostTracker;
|
| + class RenderHostTracker;
|
|
|
| virtual void Destruct() const OVERRIDE;
|
|
|
| - scoped_ptr<RenderViewHostTracker> tracker_;
|
| + scoped_ptr<RenderHostTracker> tracker_;
|
|
|
| DelegateForTests* delegate_;
|
| };
|
|
|