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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 2623353002: Share schemes needed for mixed content checking between the browser and renderer. (Closed)
Patch Set: remove unused public methods Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « content/public/test/test_utils.cc ('k') | extensions/renderer/dispatcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 net::SetExplicitlyAllowedPorts(allowed_ports); 1353 net::SetExplicitlyAllowedPorts(allowed_ports);
1354 } 1354 }
1355 } 1355 }
1356 1356
1357 void RenderThreadImpl::RegisterSchemes() { 1357 void RenderThreadImpl::RegisterSchemes() {
1358 // chrome: 1358 // chrome:
1359 WebString chrome_scheme(WebString::fromASCII(kChromeUIScheme)); 1359 WebString chrome_scheme(WebString::fromASCII(kChromeUIScheme));
1360 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_scheme); 1360 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_scheme);
1361 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( 1361 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
1362 chrome_scheme); 1362 chrome_scheme);
1363 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_scheme);
1364 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(chrome_scheme);
1365 1363
1366 // chrome-devtools: 1364 // chrome-devtools:
1367 WebString devtools_scheme(WebString::fromASCII(kChromeDevToolsScheme)); 1365 WebString devtools_scheme(WebString::fromASCII(kChromeDevToolsScheme));
1368 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(devtools_scheme); 1366 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(devtools_scheme);
1369 1367
1370 // view-source: 1368 // view-source:
1371 WebString view_source_scheme(WebString::fromASCII(kViewSourceScheme)); 1369 WebString view_source_scheme(WebString::fromASCII(kViewSourceScheme));
1372 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(view_source_scheme); 1370 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(view_source_scheme);
1373 } 1371 }
1374 1372
(...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after
2501 } 2499 }
2502 } 2500 }
2503 2501
2504 void RenderThreadImpl::OnRendererInterfaceRequest( 2502 void RenderThreadImpl::OnRendererInterfaceRequest(
2505 mojom::RendererAssociatedRequest request) { 2503 mojom::RendererAssociatedRequest request) {
2506 DCHECK(!renderer_binding_.is_bound()); 2504 DCHECK(!renderer_binding_.is_bound());
2507 renderer_binding_.Bind(std::move(request)); 2505 renderer_binding_.Bind(std::move(request));
2508 } 2506 }
2509 2507
2510 } // namespace content 2508 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/test_utils.cc ('k') | extensions/renderer/dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698