Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(785)

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 1314643002: Plugins: Remove Shadow DOM Plugin Placeholder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 25 matching lines...) Expand all
36 #include "chrome/renderer/external_extension.h" 36 #include "chrome/renderer/external_extension.h"
37 #include "chrome/renderer/loadtimes_extension_bindings.h" 37 #include "chrome/renderer/loadtimes_extension_bindings.h"
38 #include "chrome/renderer/media/chrome_key_systems.h" 38 #include "chrome/renderer/media/chrome_key_systems.h"
39 #include "chrome/renderer/net/net_error_helper.h" 39 #include "chrome/renderer/net/net_error_helper.h"
40 #include "chrome/renderer/net_benchmarking_extension.h" 40 #include "chrome/renderer/net_benchmarking_extension.h"
41 #include "chrome/renderer/page_load_histograms.h" 41 #include "chrome/renderer/page_load_histograms.h"
42 #include "chrome/renderer/pepper/pepper_helper.h" 42 #include "chrome/renderer/pepper/pepper_helper.h"
43 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h" 43 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h"
44 #include "chrome/renderer/plugins/plugin_preroller.h" 44 #include "chrome/renderer/plugins/plugin_preroller.h"
45 #include "chrome/renderer/plugins/plugin_uma.h" 45 #include "chrome/renderer/plugins/plugin_uma.h"
46 #include "chrome/renderer/plugins/shadow_dom_plugin_placeholder.h"
47 #include "chrome/renderer/prerender/prerender_dispatcher.h" 46 #include "chrome/renderer/prerender/prerender_dispatcher.h"
48 #include "chrome/renderer/prerender/prerender_helper.h" 47 #include "chrome/renderer/prerender/prerender_helper.h"
49 #include "chrome/renderer/prerender/prerenderer_client.h" 48 #include "chrome/renderer/prerender/prerenderer_client.h"
50 #include "chrome/renderer/safe_browsing/malware_dom_details.h" 49 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
51 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 50 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
52 #include "chrome/renderer/searchbox/search_bouncer.h" 51 #include "chrome/renderer/searchbox/search_bouncer.h"
53 #include "chrome/renderer/searchbox/searchbox.h" 52 #include "chrome/renderer/searchbox/searchbox.h"
54 #include "chrome/renderer/searchbox/searchbox_extension.h" 53 #include "chrome/renderer/searchbox/searchbox_extension.h"
55 #include "chrome/renderer/tts_dispatcher.h" 54 #include "chrome/renderer/tts_dispatcher.h"
56 #include "chrome/renderer/worker_content_settings_client_proxy.h" 55 #include "chrome/renderer/worker_content_settings_client_proxy.h"
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 const WebSecurityOrigin& origin) const { 635 const WebSecurityOrigin& origin) const {
637 if (!base::EqualsASCII(base::StringPiece16(origin.protocol()), 636 if (!base::EqualsASCII(base::StringPiece16(origin.protocol()),
638 extensions::kExtensionScheme)) 637 extensions::kExtensionScheme))
639 return NULL; 638 return NULL;
640 639
641 const std::string extension_id = origin.host().utf8().data(); 640 const std::string extension_id = origin.host().utf8().data();
642 return extensions::RendererExtensionRegistry::Get()->GetByID(extension_id); 641 return extensions::RendererExtensionRegistry::Get()->GetByID(extension_id);
643 } 642 }
644 #endif 643 #endif
645 644
646 scoped_ptr<blink::WebPluginPlaceholder>
647 ChromeContentRendererClient::CreatePluginPlaceholder(
648 content::RenderFrame* render_frame,
649 blink::WebLocalFrame* frame,
650 const blink::WebPluginParams& orig_params) {
651 return CreateShadowDOMPlaceholderForPluginInfo(
652 render_frame, frame, orig_params);
653 }
654
655 bool ChromeContentRendererClient::OverrideCreatePlugin( 645 bool ChromeContentRendererClient::OverrideCreatePlugin(
656 content::RenderFrame* render_frame, 646 content::RenderFrame* render_frame,
657 blink::WebLocalFrame* frame, 647 blink::WebLocalFrame* frame,
658 const WebPluginParams& params, 648 const WebPluginParams& params,
659 WebPlugin** plugin) { 649 WebPlugin** plugin) {
660 std::string orig_mime_type = params.mimeType.utf8(); 650 std::string orig_mime_type = params.mimeType.utf8();
661 #if defined(ENABLE_EXTENSIONS) 651 #if defined(ENABLE_EXTENSIONS)
662 if (orig_mime_type == content::kBrowserPluginMimeType) { 652 if (orig_mime_type == content::kBrowserPluginMimeType) {
663 bool guest_view_api_available = false; 653 bool guest_view_api_available = false;
664 extension_dispatcher_->script_context_set().ForEach( 654 extension_dispatcher_->script_context_set().ForEach(
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 1652
1663 void 1653 void
1664 ChromeContentRendererClient::DidInitializeServiceWorkerContextOnWorkerThread( 1654 ChromeContentRendererClient::DidInitializeServiceWorkerContextOnWorkerThread(
1665 v8::Local<v8::Context> context, 1655 v8::Local<v8::Context> context,
1666 const GURL& url) { 1656 const GURL& url) {
1667 #if defined(ENABLE_EXTENSIONS) 1657 #if defined(ENABLE_EXTENSIONS)
1668 extensions::Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread( 1658 extensions::Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread(
1669 context, url); 1659 context, url);
1670 #endif 1660 #endif
1671 } 1661 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698