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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 11896113: Add chrome-search: access from Instant overlay (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yet another rebase Created 7 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/common/url_constants.h ('k') | chrome/renderer/searchbox/searchbox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 563bb7ba6606cd5efaad02972f6534d0dcf5c313..aff1dfa2e9d49ef6fb69e8f673e91e13b8b65972 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -239,13 +239,16 @@ void ChromeContentRendererClient::RenderThreadStarted() {
if (command_line->HasSwitch(switches::kEnableIPCFuzzing)) {
thread->GetChannel()->set_outgoing_message_filter(LoadExternalIPCFuzzer());
}
- // chrome:, chrome-devtools:, and chrome-internal: pages should not be
- // accessible by normal content, and should also be unable to script
- // anything but themselves (to help limit the damage that a corrupt
+ // chrome:, chrome-search:, chrome-devtools:, and chrome-internal: pages
+ // should not be accessible by normal content, and should also be unable to
+ // script anything but themselves (to help limit the damage that a corrupt
// page could cause).
WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme));
WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme);
+ WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme));
+ WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_search_scheme);
+
WebString dev_tools_scheme(ASCIIToUTF16(chrome::kChromeDevToolsScheme));
WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme);
@@ -257,14 +260,17 @@ void ChromeContentRendererClient::RenderThreadStarted() {
WebSecurityPolicy::registerURLSchemeAsLocal(drive_scheme);
#endif
- // chrome: pages should not be accessible by bookmarklets or javascript:
- // URLs typed in the omnibox.
+ // chrome: and chrome-search: pages should not be accessible by bookmarklets
+ // or javascript: URLs typed in the omnibox.
WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
chrome_ui_scheme);
+ WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
+ chrome_search_scheme);
- // chrome:, and chrome-extension: resources shouldn't trigger insecure
- // content warnings.
+ // chrome:, chrome-search:, and chrome-extension: resources shouldn't trigger
+ // insecure content warnings.
WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme);
+ WebSecurityPolicy::registerURLSchemeAsSecure(chrome_search_scheme);
WebString extension_scheme(ASCIIToUTF16(extensions::kExtensionScheme));
WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
« no previous file with comments | « chrome/common/url_constants.h ('k') | chrome/renderer/searchbox/searchbox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698