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 12 matching lines...) Expand all Loading... | |
23 #include "chrome/common/extensions/extension_constants.h" | 23 #include "chrome/common/extensions/extension_constants.h" |
24 #include "chrome/common/extensions/extension_process_policy.h" | 24 #include "chrome/common/extensions/extension_process_policy.h" |
25 #include "chrome/common/localized_error.h" | 25 #include "chrome/common/localized_error.h" |
26 #include "chrome/common/pepper_permission_util.h" | 26 #include "chrome/common/pepper_permission_util.h" |
27 #include "chrome/common/render_messages.h" | 27 #include "chrome/common/render_messages.h" |
28 #include "chrome/common/url_constants.h" | 28 #include "chrome/common/url_constants.h" |
29 #include "chrome/grit/generated_resources.h" | 29 #include "chrome/grit/generated_resources.h" |
30 #include "chrome/grit/locale_settings.h" | 30 #include "chrome/grit/locale_settings.h" |
31 #include "chrome/grit/renderer_resources.h" | 31 #include "chrome/grit/renderer_resources.h" |
32 #include "chrome/renderer/benchmarking_extension.h" | 32 #include "chrome/renderer/benchmarking_extension.h" |
33 #include "chrome/renderer/browser_plugin/chrome_browser_plugin_delegate.h" | |
34 #include "chrome/renderer/chrome_render_frame_observer.h" | 33 #include "chrome/renderer/chrome_render_frame_observer.h" |
35 #include "chrome/renderer/chrome_render_process_observer.h" | 34 #include "chrome/renderer/chrome_render_process_observer.h" |
36 #include "chrome/renderer/chrome_render_view_observer.h" | 35 #include "chrome/renderer/chrome_render_view_observer.h" |
37 #include "chrome/renderer/content_settings_observer.h" | 36 #include "chrome/renderer/content_settings_observer.h" |
38 #include "chrome/renderer/external_extension.h" | 37 #include "chrome/renderer/external_extension.h" |
39 #include "chrome/renderer/loadtimes_extension_bindings.h" | 38 #include "chrome/renderer/loadtimes_extension_bindings.h" |
40 #include "chrome/renderer/media/cast_ipc_dispatcher.h" | 39 #include "chrome/renderer/media/cast_ipc_dispatcher.h" |
41 #include "chrome/renderer/media/chrome_key_systems.h" | 40 #include "chrome/renderer/media/chrome_key_systems.h" |
42 #include "chrome/renderer/net/net_error_helper.h" | 41 #include "chrome/renderer/net/net_error_helper.h" |
43 #include "chrome/renderer/net/prescient_networking_dispatcher.h" | 42 #include "chrome/renderer/net/prescient_networking_dispatcher.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 #include "content/public/common/content_constants.h" | 76 #include "content/public/common/content_constants.h" |
78 #include "content/public/renderer/render_frame.h" | 77 #include "content/public/renderer/render_frame.h" |
79 #include "content/public/renderer/render_thread.h" | 78 #include "content/public/renderer/render_thread.h" |
80 #include "content/public/renderer/render_view.h" | 79 #include "content/public/renderer/render_view.h" |
81 #include "content/public/renderer/render_view_visitor.h" | 80 #include "content/public/renderer/render_view_visitor.h" |
82 #include "extensions/common/constants.h" | 81 #include "extensions/common/constants.h" |
83 #include "extensions/common/extension.h" | 82 #include "extensions/common/extension.h" |
84 #include "extensions/common/extension_set.h" | 83 #include "extensions/common/extension_set.h" |
85 #include "extensions/common/extension_urls.h" | 84 #include "extensions/common/extension_urls.h" |
86 #include "extensions/common/switches.h" | 85 #include "extensions/common/switches.h" |
86 #include "extensions/renderer/guest_view/guest_view_container.h" | |
87 #include "ipc/ipc_sync_channel.h" | 87 #include "ipc/ipc_sync_channel.h" |
88 #include "net/base/net_errors.h" | 88 #include "net/base/net_errors.h" |
89 #include "ppapi/c/private/ppb_nacl_private.h" | 89 #include "ppapi/c/private/ppb_nacl_private.h" |
90 #include "ppapi/c/private/ppb_pdf.h" | 90 #include "ppapi/c/private/ppb_pdf.h" |
91 #include "ppapi/shared_impl/ppapi_switches.h" | 91 #include "ppapi/shared_impl/ppapi_switches.h" |
92 #include "third_party/WebKit/public/platform/WebURL.h" | 92 #include "third_party/WebKit/public/platform/WebURL.h" |
93 #include "third_party/WebKit/public/platform/WebURLError.h" | 93 #include "third_party/WebKit/public/platform/WebURLError.h" |
94 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 94 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
95 #include "third_party/WebKit/public/web/WebCache.h" | 95 #include "third_party/WebKit/public/web/WebCache.h" |
96 #include "third_party/WebKit/public/web/WebDataSource.h" | 96 #include "third_party/WebKit/public/web/WebDataSource.h" |
(...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1566 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 1566 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
1567 #else | 1567 #else |
1568 return false; | 1568 return false; |
1569 #endif | 1569 #endif |
1570 } | 1570 } |
1571 | 1571 |
1572 content::BrowserPluginDelegate* | 1572 content::BrowserPluginDelegate* |
1573 ChromeContentRendererClient::CreateBrowserPluginDelegate( | 1573 ChromeContentRendererClient::CreateBrowserPluginDelegate( |
1574 content::RenderFrame* render_frame, | 1574 content::RenderFrame* render_frame, |
1575 const std::string& mime_type) { | 1575 const std::string& mime_type) { |
1576 return new ChromeBrowserPluginDelegate(render_frame, mime_type); | 1576 return new extensions::GuestViewContainer(render_frame, mime_type); |
Ken Rockot(use gerrit already)
2014/09/16 05:01:52
Need to test ENABLE_EXTENSIONS
| |
1577 } | 1577 } |
OLD | NEW |