| 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 15 matching lines...) Expand all Loading... |
| 26 #include "chrome/grit/generated_resources.h" | 26 #include "chrome/grit/generated_resources.h" |
| 27 #include "chrome/grit/locale_settings.h" | 27 #include "chrome/grit/locale_settings.h" |
| 28 #include "chrome/grit/renderer_resources.h" | 28 #include "chrome/grit/renderer_resources.h" |
| 29 #include "chrome/renderer/benchmarking_extension.h" | 29 #include "chrome/renderer/benchmarking_extension.h" |
| 30 #include "chrome/renderer/chrome_render_frame_observer.h" | 30 #include "chrome/renderer/chrome_render_frame_observer.h" |
| 31 #include "chrome/renderer/chrome_render_process_observer.h" | 31 #include "chrome/renderer/chrome_render_process_observer.h" |
| 32 #include "chrome/renderer/chrome_render_view_observer.h" | 32 #include "chrome/renderer/chrome_render_view_observer.h" |
| 33 #include "chrome/renderer/content_settings_observer.h" | 33 #include "chrome/renderer/content_settings_observer.h" |
| 34 #include "chrome/renderer/external_extension.h" | 34 #include "chrome/renderer/external_extension.h" |
| 35 #include "chrome/renderer/loadtimes_extension_bindings.h" | 35 #include "chrome/renderer/loadtimes_extension_bindings.h" |
| 36 #include "chrome/renderer/manifest/manifest_parser.h" |
| 36 #include "chrome/renderer/media/chrome_key_systems.h" | 37 #include "chrome/renderer/media/chrome_key_systems.h" |
| 37 #include "chrome/renderer/net/net_error_helper.h" | 38 #include "chrome/renderer/net/net_error_helper.h" |
| 38 #include "chrome/renderer/net_benchmarking_extension.h" | 39 #include "chrome/renderer/net_benchmarking_extension.h" |
| 39 #include "chrome/renderer/page_load_histograms.h" | 40 #include "chrome/renderer/page_load_histograms.h" |
| 40 #include "chrome/renderer/pepper/pepper_helper.h" | 41 #include "chrome/renderer/pepper/pepper_helper.h" |
| 41 #include "chrome/renderer/playback_extension.h" | 42 #include "chrome/renderer/playback_extension.h" |
| 42 #include "chrome/renderer/plugins/chrome_plugin_placeholder.h" | 43 #include "chrome/renderer/plugins/chrome_plugin_placeholder.h" |
| 43 #include "chrome/renderer/plugins/plugin_preroller.h" | 44 #include "chrome/renderer/plugins/plugin_preroller.h" |
| 44 #include "chrome/renderer/plugins/plugin_uma.h" | 45 #include "chrome/renderer/plugins/plugin_uma.h" |
| 45 #include "chrome/renderer/plugins/shadow_dom_plugin_placeholder.h" | 46 #include "chrome/renderer/plugins/shadow_dom_plugin_placeholder.h" |
| (...skipping 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1578 if (mime_type == content::kBrowserPluginMimeType) { | 1579 if (mime_type == content::kBrowserPluginMimeType) { |
| 1579 return new extensions::ExtensionsGuestViewContainer(render_frame); | 1580 return new extensions::ExtensionsGuestViewContainer(render_frame); |
| 1580 } else { | 1581 } else { |
| 1581 return new extensions::MimeHandlerViewContainer( | 1582 return new extensions::MimeHandlerViewContainer( |
| 1582 render_frame, mime_type, original_url); | 1583 render_frame, mime_type, original_url); |
| 1583 } | 1584 } |
| 1584 #else | 1585 #else |
| 1585 return NULL; | 1586 return NULL; |
| 1586 #endif | 1587 #endif |
| 1587 } | 1588 } |
| 1589 |
| 1590 bool ChromeContentRendererClient::OverrideManifestParser( |
| 1591 content::ManifestParser** parser) { |
| 1592 *parser = new ChromeManifestParser(); |
| 1593 return true; |
| 1594 } |
| OLD | NEW |