Chromium Code Reviews| 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/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 120 #include "extensions/renderer/dispatcher.h" | 120 #include "extensions/renderer/dispatcher.h" |
| 121 #include "extensions/renderer/extension_frame_helper.h" | 121 #include "extensions/renderer/extension_frame_helper.h" |
| 122 #include "extensions/renderer/extension_helper.h" | 122 #include "extensions/renderer/extension_helper.h" |
| 123 #include "extensions/renderer/extensions_render_frame_observer.h" | 123 #include "extensions/renderer/extensions_render_frame_observer.h" |
| 124 #include "extensions/renderer/guest_view/extensions_guest_view_container.h" | 124 #include "extensions/renderer/guest_view/extensions_guest_view_container.h" |
| 125 #include "extensions/renderer/guest_view/guest_view_container.h" | 125 #include "extensions/renderer/guest_view/guest_view_container.h" |
| 126 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_con tainer.h" | 126 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_con tainer.h" |
| 127 #include "extensions/renderer/script_context.h" | 127 #include "extensions/renderer/script_context.h" |
| 128 #endif | 128 #endif |
| 129 | 129 |
| 130 #if defined(ENABLE_IPC_FUZZER) | |
| 131 #include "chrome/common/external_ipc_dumper.h" | |
| 132 #endif | |
| 133 | |
| 130 #if defined(ENABLE_PRINTING) | 134 #if defined(ENABLE_PRINTING) |
| 131 #include "chrome/renderer/printing/chrome_print_web_view_helper_delegate.h" | 135 #include "chrome/renderer/printing/chrome_print_web_view_helper_delegate.h" |
| 132 #include "components/printing/renderer/print_web_view_helper.h" | 136 #include "components/printing/renderer/print_web_view_helper.h" |
| 133 #endif | 137 #endif |
| 134 | 138 |
| 135 #if defined(ENABLE_PRINT_PREVIEW) | 139 #if defined(ENABLE_PRINT_PREVIEW) |
| 136 #include "chrome/renderer/pepper/chrome_pdf_print_client.h" | 140 #include "chrome/renderer/pepper/chrome_pdf_print_client.h" |
| 137 #endif | 141 #endif |
| 138 | 142 |
| 139 #if defined(ENABLE_SPELLCHECK) | 143 #if defined(ENABLE_SPELLCHECK) |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 453 WebString dom_distiller_scheme( | 457 WebString dom_distiller_scheme( |
| 454 ASCIIToUTF16(dom_distiller::kDomDistillerScheme)); | 458 ASCIIToUTF16(dom_distiller::kDomDistillerScheme)); |
| 455 // TODO(nyquist): Add test to ensure this happens when the flag is set. | 459 // TODO(nyquist): Add test to ensure this happens when the flag is set. |
| 456 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dom_distiller_scheme); | 460 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dom_distiller_scheme); |
| 457 | 461 |
| 458 #if defined(OS_CHROMEOS) | 462 #if defined(OS_CHROMEOS) |
| 459 WebString external_file_scheme(ASCIIToUTF16(content::kExternalFileScheme)); | 463 WebString external_file_scheme(ASCIIToUTF16(content::kExternalFileScheme)); |
| 460 WebSecurityPolicy::registerURLSchemeAsLocal(external_file_scheme); | 464 WebSecurityPolicy::registerURLSchemeAsLocal(external_file_scheme); |
| 461 #endif | 465 #endif |
| 462 | 466 |
| 467 #if defined(ENABLE_IPC_FUZZER) | |
| 468 if (command_line->HasSwitch(switches::kIpcDumpDirectory)) { | |
| 469 base::FilePath dump_directory = | |
| 470 command_line->GetSwitchValuePath(switches::kIpcDumpDirectory); | |
| 471 thread->GetChannel()->set_outgoing_message_filter( | |
| 472 LoadExternalIPCDumper(dump_directory)); | |
|
inferno
2015/03/05 18:46:47
put LoadExternalIPCDumper(dump_directory) in a loc
| |
| 473 } | |
| 474 #endif | |
| 475 | |
| 463 // chrome: and chrome-search: pages should not be accessible by bookmarklets | 476 // chrome: and chrome-search: pages should not be accessible by bookmarklets |
| 464 // or javascript: URLs typed in the omnibox. | 477 // or javascript: URLs typed in the omnibox. |
| 465 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 478 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
| 466 chrome_ui_scheme); | 479 chrome_ui_scheme); |
| 467 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 480 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
| 468 chrome_search_scheme); | 481 chrome_search_scheme); |
| 469 | 482 |
| 470 // chrome:, chrome-search:, chrome-extension:, and chrome-extension-resource: | 483 // chrome:, chrome-search:, chrome-extension:, and chrome-extension-resource: |
| 471 // resources shouldn't trigger insecure content warnings. | 484 // resources shouldn't trigger insecure content warnings. |
| 472 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme); | 485 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme); |
| (...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1640 if (mime_type == content::kBrowserPluginMimeType) { | 1653 if (mime_type == content::kBrowserPluginMimeType) { |
| 1641 return new extensions::ExtensionsGuestViewContainer(render_frame); | 1654 return new extensions::ExtensionsGuestViewContainer(render_frame); |
| 1642 } else { | 1655 } else { |
| 1643 return new extensions::MimeHandlerViewContainer( | 1656 return new extensions::MimeHandlerViewContainer( |
| 1644 render_frame, mime_type, original_url); | 1657 render_frame, mime_type, original_url); |
| 1645 } | 1658 } |
| 1646 #else | 1659 #else |
| 1647 return NULL; | 1660 return NULL; |
| 1648 #endif | 1661 #endif |
| 1649 } | 1662 } |
| OLD | NEW |