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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 649873006: Enable shadow DOM-based "missing plugin" placeholder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test for allowed plugin Created 6 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1587 matching lines...) Expand 10 before | Expand all | Expand 10 after
1598 mojo::js::Support::kModuleName, 1598 mojo::js::Support::kModuleName,
1599 mojo::js::Support::GetModule(isolate)); 1599 mojo::js::Support::GetModule(isolate));
1600 registry->AddBuiltinModule( 1600 registry->AddBuiltinModule(
1601 isolate, 1601 isolate,
1602 ServiceRegistryJsWrapper::kModuleName, 1602 ServiceRegistryJsWrapper::kModuleName,
1603 ServiceRegistryJsWrapper::Create(isolate, &service_registry_).ToV8()); 1603 ServiceRegistryJsWrapper::Create(isolate, &service_registry_).ToV8());
1604 } 1604 }
1605 1605
1606 // blink::WebFrameClient implementation ---------------------------------------- 1606 // blink::WebFrameClient implementation ----------------------------------------
1607 1607
1608 blink::WebPluginPlaceholder* RenderFrameImpl::createPluginPlaceholder(
1609 blink::WebLocalFrame* frame,
1610 const blink::WebPluginParams& params) {
1611 DCHECK_EQ(frame_, frame);
1612 return GetContentClient()->renderer()->OverrideCreatePluginPlaceholder(
1613 this, frame, params);
1614 }
1615
1608 blink::WebPlugin* RenderFrameImpl::createPlugin( 1616 blink::WebPlugin* RenderFrameImpl::createPlugin(
1609 blink::WebLocalFrame* frame, 1617 blink::WebLocalFrame* frame,
1610 const blink::WebPluginParams& params) { 1618 const blink::WebPluginParams& params) {
1611 DCHECK_EQ(frame_, frame); 1619 DCHECK_EQ(frame_, frame);
1612 blink::WebPlugin* plugin = NULL; 1620 blink::WebPlugin* plugin = NULL;
1613 if (GetContentClient()->renderer()->OverrideCreatePlugin( 1621 if (GetContentClient()->renderer()->OverrideCreatePlugin(
1614 this, frame, params, &plugin)) { 1622 this, frame, params, &plugin)) {
1615 return plugin; 1623 return plugin;
1616 } 1624 }
1617 1625
(...skipping 2490 matching lines...) Expand 10 before | Expand all | Expand 10 after
4108 4116
4109 #if defined(ENABLE_BROWSER_CDMS) 4117 #if defined(ENABLE_BROWSER_CDMS)
4110 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4118 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4111 if (!cdm_manager_) 4119 if (!cdm_manager_)
4112 cdm_manager_ = new RendererCdmManager(this); 4120 cdm_manager_ = new RendererCdmManager(this);
4113 return cdm_manager_; 4121 return cdm_manager_;
4114 } 4122 }
4115 #endif // defined(ENABLE_BROWSER_CDMS) 4123 #endif // defined(ENABLE_BROWSER_CDMS)
4116 4124
4117 } // namespace content 4125 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698