set force close only when dealing with top frames

rogerwang · rogerwang · commit 9d8b7925ea22 · 2014-04-24T13:48:22.000+08:00
diff --git a/src/renderer/shell_content_renderer_client.cc b/src/renderer/shell_content_renderer_client.cc
@@ -354,8 +354,12 @@ void ShellContentRendererClient::InstallNodeSymbols(
     int ret;
     RenderViewImpl* render_view = RenderViewImpl::FromWebView(frame->view());
 
-    render_view->Send(new ShellViewHostMsg_SetForceClose(
+    if (frame->parent() == NULL) {
+      // do this only for top frames, or initialization of iframe
+      // could override parent settings here
+      render_view->Send(new ShellViewHostMsg_SetForceClose(
             render_view->GetRoutingID(), true, &ret));
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -354,8 +354,12 @@ void ShellContentRendererClient::InstallNodeSymbols(`
`354`	`354`	`int ret;`
`355`	`355`	`RenderViewImpl* render_view = RenderViewImpl::FromWebView(frame->view());`
`356`	`356`
`357`		`- render_view->Send(new ShellViewHostMsg_SetForceClose(`
	`357`	`+ if (frame->parent() == NULL) {`
	`358`	`+ // do this only for top frames, or initialization of iframe`
	`359`	`+ // could override parent settings here`
	`360`	`+ render_view->Send(new ShellViewHostMsg_SetForceClose(`
`358`	`361`	`render_view->GetRoutingID(), true, &ret));`
	`362`	`+ }`
`359`	`363`	`}`
`360`	`364`	`}`
`361`	`365`