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

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: Don't crash on tear down 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 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1444 ServiceRegistry* RenderFrameImpl::GetServiceRegistry() { 1444 ServiceRegistry* RenderFrameImpl::GetServiceRegistry() {
1445 return &service_registry_; 1445 return &service_registry_;
1446 } 1446 }
1447 1447
1448 bool RenderFrameImpl::IsFTPDirectoryListing() { 1448 bool RenderFrameImpl::IsFTPDirectoryListing() {
1449 WebURLResponseExtraDataImpl* extra_data = 1449 WebURLResponseExtraDataImpl* extra_data =
1450 GetExtraDataFromResponse(frame_->dataSource()->response()); 1450 GetExtraDataFromResponse(frame_->dataSource()->response());
1451 return extra_data ? extra_data->is_ftp_directory_listing() : false; 1451 return extra_data ? extra_data->is_ftp_directory_listing() : false;
1452 } 1452 }
1453 1453
1454 void RenderFrameImpl::AttachGuest(int element_instance_id) {
1455 render_view_->GetBrowserPluginManager()->Attach(element_instance_id);
1456 }
1457
1454 // blink::WebFrameClient implementation ---------------------------------------- 1458 // blink::WebFrameClient implementation ----------------------------------------
1455 1459
1456 blink::WebPlugin* RenderFrameImpl::createPlugin( 1460 blink::WebPlugin* RenderFrameImpl::createPlugin(
1457 blink::WebLocalFrame* frame, 1461 blink::WebLocalFrame* frame,
1458 const blink::WebPluginParams& params) { 1462 const blink::WebPluginParams& params) {
1459 DCHECK_EQ(frame_, frame); 1463 DCHECK_EQ(frame_, frame);
1460 blink::WebPlugin* plugin = NULL; 1464 blink::WebPlugin* plugin = NULL;
1461 if (GetContentClient()->renderer()->OverrideCreatePlugin( 1465 if (GetContentClient()->renderer()->OverrideCreatePlugin(
1462 this, frame, params, &plugin)) { 1466 this, frame, params, &plugin)) {
1463 return plugin; 1467 return plugin;
(...skipping 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after
3734 3738
3735 #if defined(ENABLE_BROWSER_CDMS) 3739 #if defined(ENABLE_BROWSER_CDMS)
3736 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3740 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3737 if (!cdm_manager_) 3741 if (!cdm_manager_)
3738 cdm_manager_ = new RendererCdmManager(this); 3742 cdm_manager_ = new RendererCdmManager(this);
3739 return cdm_manager_; 3743 return cdm_manager_;
3740 } 3744 }
3741 #endif // defined(ENABLE_BROWSER_CDMS) 3745 #endif // defined(ENABLE_BROWSER_CDMS)
3742 3746
3743 } // namespace content 3747 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | extensions/browser/guest_view/app_view/app_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698