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 <vector> | 10 #include <vector> |
(...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1143 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(swappedout_scheme); | 1143 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(swappedout_scheme); |
1144 WebSecurityPolicy::registerURLSchemeAsEmptyDocument(swappedout_scheme); | 1144 WebSecurityPolicy::registerURLSchemeAsEmptyDocument(swappedout_scheme); |
1145 | 1145 |
1146 // chrome: | 1146 // chrome: |
1147 WebString chrome_scheme(base::ASCIIToUTF16(kChromeUIScheme)); | 1147 WebString chrome_scheme(base::ASCIIToUTF16(kChromeUIScheme)); |
1148 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_scheme); | 1148 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_scheme); |
1149 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 1149 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
1150 chrome_scheme); | 1150 chrome_scheme); |
1151 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_scheme); | 1151 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_scheme); |
1152 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(chrome_scheme); | 1152 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(chrome_scheme); |
| 1153 WebSecurityPolicy::registerURLSchemeAsRestrictingMixedContent(chrome_scheme); |
1153 | 1154 |
1154 // chrome-devtools: | 1155 // chrome-devtools: |
1155 WebString devtools_scheme(base::ASCIIToUTF16(kChromeDevToolsScheme)); | 1156 WebString devtools_scheme(base::ASCIIToUTF16(kChromeDevToolsScheme)); |
1156 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(devtools_scheme); | 1157 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(devtools_scheme); |
| 1158 WebSecurityPolicy::registerURLSchemeAsSecure(devtools_scheme); |
| 1159 WebSecurityPolicy::registerURLSchemeAsRestrictingMixedContent( |
| 1160 devtools_scheme); |
1157 } | 1161 } |
1158 | 1162 |
1159 void RenderThreadImpl::NotifyTimezoneChange() { | 1163 void RenderThreadImpl::NotifyTimezoneChange() { |
1160 NotifyTimezoneChangeOnThisThread(); | 1164 NotifyTimezoneChangeOnThisThread(); |
1161 RenderThread::Get()->PostTaskToAllWebWorkers( | 1165 RenderThread::Get()->PostTaskToAllWebWorkers( |
1162 base::Bind(&NotifyTimezoneChangeOnThisThread)); | 1166 base::Bind(&NotifyTimezoneChangeOnThisThread)); |
1163 } | 1167 } |
1164 | 1168 |
1165 void RenderThreadImpl::RecordAction(const base::UserMetricsAction& action) { | 1169 void RenderThreadImpl::RecordAction(const base::UserMetricsAction& action) { |
1166 Send(new ViewHostMsg_UserMetricsRecordAction(action.str_)); | 1170 Send(new ViewHostMsg_UserMetricsRecordAction(action.str_)); |
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1896 } | 1900 } |
1897 | 1901 |
1898 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1902 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1899 size_t erased = | 1903 size_t erased = |
1900 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1904 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1901 routing_id_); | 1905 routing_id_); |
1902 DCHECK_EQ(1u, erased); | 1906 DCHECK_EQ(1u, erased); |
1903 } | 1907 } |
1904 | 1908 |
1905 } // namespace content | 1909 } // namespace content |
OLD | NEW |