Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(999)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/child_process_security_policy.cc

Issue 9801002: Simplest backport of 117417. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | content/browser/mock_content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_security_policy.cc
===================================================================
--- content/browser/child_process_security_policy.cc (revision 127767)
+++ content/browser/child_process_security_policy.cc (working copy)
@@ -11,6 +11,7 @@
#include "base/stl_util.h"
#include "base/string_util.h"
#include "content/browser/site_instance.h"
+#include "content/public/browser/content_browser_client.h"
#include "content/public/common/bindings_policy.h"
#include "content/public/common/url_constants.h"
#include "googleurl/src/gurl.h"
@@ -382,7 +383,8 @@
return false;
}
- if (!net::URLRequest::IsHandledURL(url))
+ if (!content::GetContentClient()->browser()->IsHandledURL(url) &&
+ !net::URLRequest::IsHandledURL(url))
return true; // This URL request is destined for ShellExecute.
{
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | content/browser/mock_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698