OLD | NEW |
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 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1244 } | 1244 } |
1245 | 1245 |
1246 if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) { | 1246 if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) { |
1247 std::string allowed_ports = | 1247 std::string allowed_ports = |
1248 command_line.GetSwitchValueASCII(switches::kExplicitlyAllowedPorts); | 1248 command_line.GetSwitchValueASCII(switches::kExplicitlyAllowedPorts); |
1249 net::SetExplicitlyAllowedPorts(allowed_ports); | 1249 net::SetExplicitlyAllowedPorts(allowed_ports); |
1250 } | 1250 } |
1251 } | 1251 } |
1252 | 1252 |
1253 void RenderThreadImpl::RegisterSchemes() { | 1253 void RenderThreadImpl::RegisterSchemes() { |
1254 // swappedout: | |
1255 WebString swappedout_scheme(base::ASCIIToUTF16(kSwappedOutScheme)); | |
1256 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(swappedout_scheme); | |
1257 WebSecurityPolicy::registerURLSchemeAsEmptyDocument(swappedout_scheme); | |
1258 | |
1259 // chrome: | 1254 // chrome: |
1260 WebString chrome_scheme(base::ASCIIToUTF16(kChromeUIScheme)); | 1255 WebString chrome_scheme(base::ASCIIToUTF16(kChromeUIScheme)); |
1261 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_scheme); | 1256 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_scheme); |
1262 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 1257 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
1263 chrome_scheme); | 1258 chrome_scheme); |
1264 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_scheme); | 1259 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_scheme); |
1265 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(chrome_scheme); | 1260 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(chrome_scheme); |
1266 | 1261 |
1267 // chrome-devtools: | 1262 // chrome-devtools: |
1268 WebString devtools_scheme(base::ASCIIToUTF16(kChromeDevToolsScheme)); | 1263 WebString devtools_scheme(base::ASCIIToUTF16(kChromeDevToolsScheme)); |
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2044 } | 2039 } |
2045 | 2040 |
2046 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2041 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2047 size_t erased = | 2042 size_t erased = |
2048 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2043 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2049 routing_id_); | 2044 routing_id_); |
2050 DCHECK_EQ(1u, erased); | 2045 DCHECK_EQ(1u, erased); |
2051 } | 2046 } |
2052 | 2047 |
2053 } // namespace content | 2048 } // namespace content |
OLD | NEW |