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

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

Issue 444813002: Remove BrowserPlugin's -internal-attach method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated comment Created 6 years, 4 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 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 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 ServiceRegistry* RenderFrameImpl::GetServiceRegistry() { 1440 ServiceRegistry* RenderFrameImpl::GetServiceRegistry() {
1441 return &service_registry_; 1441 return &service_registry_;
1442 } 1442 }
1443 1443
1444 bool RenderFrameImpl::IsFTPDirectoryListing() { 1444 bool RenderFrameImpl::IsFTPDirectoryListing() {
1445 WebURLResponseExtraDataImpl* extra_data = 1445 WebURLResponseExtraDataImpl* extra_data =
1446 GetExtraDataFromResponse(frame_->dataSource()->response()); 1446 GetExtraDataFromResponse(frame_->dataSource()->response());
1447 return extra_data ? extra_data->is_ftp_directory_listing() : false; 1447 return extra_data ? extra_data->is_ftp_directory_listing() : false;
1448 } 1448 }
1449 1449
1450 void RenderFrameImpl::AttachToBrowserPlugin(int browser_plugin_instance_id,
1451 int guest_instance_id) {
1452 render_view_->GetBrowserPluginManager()->Attach(browser_plugin_instance_id,
1453 guest_instance_id);
1454 }
1455
1450 // blink::WebFrameClient implementation ---------------------------------------- 1456 // blink::WebFrameClient implementation ----------------------------------------
1451 1457
1452 blink::WebPlugin* RenderFrameImpl::createPlugin( 1458 blink::WebPlugin* RenderFrameImpl::createPlugin(
1453 blink::WebLocalFrame* frame, 1459 blink::WebLocalFrame* frame,
1454 const blink::WebPluginParams& params) { 1460 const blink::WebPluginParams& params) {
1455 DCHECK_EQ(frame_, frame); 1461 DCHECK_EQ(frame_, frame);
1456 blink::WebPlugin* plugin = NULL; 1462 blink::WebPlugin* plugin = NULL;
1457 if (GetContentClient()->renderer()->OverrideCreatePlugin( 1463 if (GetContentClient()->renderer()->OverrideCreatePlugin(
1458 this, frame, params, &plugin)) { 1464 this, frame, params, &plugin)) {
1459 return plugin; 1465 return plugin;
(...skipping 2259 matching lines...) Expand 10 before | Expand all | Expand 10 after
3719 3725
3720 #if defined(ENABLE_BROWSER_CDMS) 3726 #if defined(ENABLE_BROWSER_CDMS)
3721 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3727 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3722 if (!cdm_manager_) 3728 if (!cdm_manager_)
3723 cdm_manager_ = new RendererCdmManager(this); 3729 cdm_manager_ = new RendererCdmManager(this);
3724 return cdm_manager_; 3730 return cdm_manager_;
3725 } 3731 }
3726 #endif // defined(ENABLE_BROWSER_CDMS) 3732 #endif // defined(ENABLE_BROWSER_CDMS)
3727 3733
3728 } // namespace content 3734 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698