Only disallow top-level navigations in platform apps

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index e85257490bd2194fbdaea628150207a0205cba87..f9a8ee9fbc3186dfefe4358bb5a58d1db5f87f2e 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2362,14 +2362,18 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
     }
   }
 
-  // If the browser is interested, then give it a chance to look at top level
-  // navigations.
+  // If the browser is interested, then give it a chance to look at the request.
   if (is_content_initiated) {
-    bool browser_handles_top_level_requests =
+    bool browser_handles_request =
         renderer_preferences_.browser_handles_top_level_requests &&
         IsNonLocalTopLevelNavigation(url, frame, type);
-    if (browser_handles_top_level_requests ||
-        renderer_preferences_.browser_handles_all_requests) {
+    if (!browser_handles_request) {
+      browser_handles_request = renderer_preferences_.
+              browser_handles_all_top_level_or_non_local_requests &&
+          IsNonLocalOrTopLevelNavigation(url, frame);
+    }
+
+    if (browser_handles_request) {
       // Reset these counters as the RenderView could be reused for the next
       // navigation.
       page_id_ = -1;
@@ -5211,8 +5215,21 @@ WebKit::WebUserMediaClient* RenderViewImpl::userMediaClient() {
   return media_stream_impl_;
 }
 
+bool RenderViewImpl::IsNonLocalOrTopLevelNavigation(
+    const GURL& url, WebKit::WebFrame* frame) const {
+  if (frame->parent() == NULL)
+    return true;
+
+  // data: URLs don't involve remote content either.

[miket_OOO, 2012/05/11 18:29:08]

Tiny nit: "don't involve remote" is a different kind of double negative from
"NonLocal," and it makes the code slightly harder to review. Can you rephrase
the comment using the same terminology as the method name?

[Mihai Parparita -not on Chrome, 2012/05/11 19:40:49]

Rephrased.

+  if (url.SchemeIs(chrome::kDataScheme))
+    return false;
+
+  return url.GetOrigin() != GURL(frame->top()->document().url()).GetOrigin();
+}
+
 bool RenderViewImpl::IsNonLocalTopLevelNavigation(
-    const GURL& url, WebKit::WebFrame* frame, WebKit::WebNavigationType type) {
+    const GURL& url, WebKit::WebFrame* frame, WebKit::WebNavigationType type)
+    const {
   // Must be a top level frame.
   if (frame->parent() != NULL)
     return false;