diff options
| author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-06-23 14:29:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-23 21:29:34 +0000 |
| commit | c5d9a0ea754aba8264a36e59d2a60a6722fd56b3 (patch) | |
| tree | 5164bed777068a3bee85414a81df97bc1e05574b /extensions/browser/app_window | |
| parent | f148b2547d6914bc596a10791ceb795ffb838693 (diff) | |
| download | chromium_src-c5d9a0ea754aba8264a36e59d2a60a6722fd56b3.zip chromium_src-c5d9a0ea754aba8264a36e59d2a60a6722fd56b3.tar.gz chromium_src-c5d9a0ea754aba8264a36e59d2a60a6722fd56b3.tar.bz2 | |
[Extensions OOPI] Change ExtensionMsg_MessageInvoke to use RenderFrames
Change ExtensionMsg_MessageInvoke to use RenderFrames instead of RenderViews.
This also makes it easy to change ScriptContextSet to implement a ForEach with
RenderFrames.
BUG=455776
TBR=thestig@chromium.org (micro chrome_content_renderer_client change)
Review URL: https://codereview.chromium.org/1198203003
Cr-Commit-Position: refs/heads/master@{#335753}
Diffstat (limited to 'extensions/browser/app_window')
| -rw-r--r-- | extensions/browser/app_window/app_window_contents.cc | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/extensions/browser/app_window/app_window_contents.cc b/extensions/browser/app_window/app_window_contents.cc index 396a638..8d8c9ae 100644 --- a/extensions/browser/app_window/app_window_contents.cc +++ b/extensions/browser/app_window/app_window_contents.cc @@ -9,6 +9,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_dispatcher_host.h" @@ -64,13 +65,10 @@ void AppWindowContentsImpl::NativeWindowChanged( args.Append(dictionary); host_->GetSerializedState(dictionary); - content::RenderViewHost* rvh = web_contents_->GetRenderViewHost(); - rvh->Send(new ExtensionMsg_MessageInvoke(rvh->GetRoutingID(), - host_->extension_id(), - "app.window", - "updateAppWindowProperties", - args, - false)); + content::RenderFrameHost* rfh = web_contents_->GetMainFrame(); + rfh->Send(new ExtensionMsg_MessageInvoke( + rfh->GetRoutingID(), host_->extension_id(), "app.window", + "updateAppWindowProperties", args, false)); } void AppWindowContentsImpl::NativeWindowClosed() { @@ -80,13 +78,10 @@ void AppWindowContentsImpl::NativeWindowClosed() { void AppWindowContentsImpl::DispatchWindowShownForTests() const { base::ListValue args; - content::RenderViewHost* rvh = web_contents_->GetRenderViewHost(); - rvh->Send(new ExtensionMsg_MessageInvoke(rvh->GetRoutingID(), - host_->extension_id(), - "app.window", - "appWindowShownForTests", - args, - false)); + content::RenderFrameHost* rfh = web_contents_->GetMainFrame(); + rfh->Send(new ExtensionMsg_MessageInvoke( + rfh->GetRoutingID(), host_->extension_id(), "app.window", + "appWindowShownForTests", args, false)); } content::WebContents* AppWindowContentsImpl::GetWebContents() const { |