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 "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); | 276 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); |
277 if (command_line->HasSwitch(switches::kInstantProcess)) | 277 if (command_line->HasSwitch(switches::kInstantProcess)) |
278 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); | 278 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); |
279 | 279 |
280 if (command_line->HasSwitch(switches::kPlaybackMode) || | 280 if (command_line->HasSwitch(switches::kPlaybackMode) || |
281 command_line->HasSwitch(switches::kRecordMode) || | 281 command_line->HasSwitch(switches::kRecordMode) || |
282 command_line->HasSwitch(switches::kNoJsRandomness)) { | 282 command_line->HasSwitch(switches::kNoJsRandomness)) { |
283 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); | 283 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); |
284 } | 284 } |
285 | 285 |
286 // chrome:, chrome-search:, chrome-devtools:, and chrome-internal: pages | 286 // chrome:, chrome-search:, chrome-devtools:, chrome-distiller: and |
287 // should not be accessible by normal content, and should also be unable to | 287 // chrome-internal: pages should not be accessible by normal content, and |
288 // script anything but themselves (to help limit the damage that a corrupt | 288 // should also be unable to script anything but themselves (to help limit the |
289 // page could cause). | 289 // damage that a corrupt page could cause). |
290 WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme)); | 290 WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme)); |
291 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme); | 291 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme); |
292 | 292 |
293 WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme)); | 293 WebString chrome_search_scheme(ASCIIToUTF16(chrome::kChromeSearchScheme)); |
294 // The Instant process can only display the content but not read it. Other | 294 // The Instant process can only display the content but not read it. Other |
295 // processes can't display it or read it. | 295 // processes can't display it or read it. |
296 if (!command_line->HasSwitch(switches::kInstantProcess)) | 296 if (!command_line->HasSwitch(switches::kInstantProcess)) |
297 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_search_scheme); | 297 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_search_scheme); |
298 | 298 |
299 WebString dev_tools_scheme(ASCIIToUTF16(chrome::kChromeDevToolsScheme)); | 299 WebString dev_tools_scheme(ASCIIToUTF16(chrome::kChromeDevToolsScheme)); |
300 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme); | 300 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme); |
301 | 301 |
302 WebString internal_scheme(ASCIIToUTF16(chrome::kChromeInternalScheme)); | 302 WebString internal_scheme(ASCIIToUTF16(chrome::kChromeInternalScheme)); |
303 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(internal_scheme); | 303 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(internal_scheme); |
304 | 304 |
| 305 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 306 switches::kEnableDomDistiller)) { |
| 307 WebString dom_distiller_scheme(ASCIIToUTF16(chrome::kDomDistillerScheme)); |
| 308 // TODO(nyquist): Add test to ensure this happens when the flag is set. |
| 309 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dom_distiller_scheme); |
| 310 } |
| 311 |
305 #if defined(OS_CHROMEOS) | 312 #if defined(OS_CHROMEOS) |
306 WebString drive_scheme(ASCIIToUTF16(chrome::kDriveScheme)); | 313 WebString drive_scheme(ASCIIToUTF16(chrome::kDriveScheme)); |
307 WebSecurityPolicy::registerURLSchemeAsLocal(drive_scheme); | 314 WebSecurityPolicy::registerURLSchemeAsLocal(drive_scheme); |
308 #endif | 315 #endif |
309 | 316 |
310 // chrome: and chrome-search: pages should not be accessible by bookmarklets | 317 // chrome: and chrome-search: pages should not be accessible by bookmarklets |
311 // or javascript: URLs typed in the omnibox. | 318 // or javascript: URLs typed in the omnibox. |
312 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 319 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
313 chrome_ui_scheme); | 320 chrome_ui_scheme); |
314 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 321 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1385 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 1392 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
1386 return !command_line->HasSwitch(switches::kExtensionProcess); | 1393 return !command_line->HasSwitch(switches::kExtensionProcess); |
1387 } | 1394 } |
1388 | 1395 |
1389 blink::WebWorkerPermissionClientProxy* | 1396 blink::WebWorkerPermissionClientProxy* |
1390 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( | 1397 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( |
1391 content::RenderView* render_view, | 1398 content::RenderView* render_view, |
1392 blink::WebFrame* frame) { | 1399 blink::WebFrame* frame) { |
1393 return new WorkerPermissionClientProxy(render_view, frame); | 1400 return new WorkerPermissionClientProxy(render_view, frame); |
1394 } | 1401 } |
OLD | NEW |