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

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

Issue 547093002: Return WebLocalFrame from RenderFrame::GetWebFrame(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 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 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after
1452 } 1452 }
1453 1453
1454 RenderView* RenderFrameImpl::GetRenderView() { 1454 RenderView* RenderFrameImpl::GetRenderView() {
1455 return render_view_.get(); 1455 return render_view_.get();
1456 } 1456 }
1457 1457
1458 int RenderFrameImpl::GetRoutingID() { 1458 int RenderFrameImpl::GetRoutingID() {
1459 return routing_id_; 1459 return routing_id_;
1460 } 1460 }
1461 1461
1462 blink::WebFrame* RenderFrameImpl::GetWebFrame() { 1462 blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
1463 DCHECK(frame_); 1463 DCHECK(frame_);
1464 return frame_; 1464 return frame_;
1465 } 1465 }
1466 1466
1467 WebPreferences& RenderFrameImpl::GetWebkitPreferences() { 1467 WebPreferences& RenderFrameImpl::GetWebkitPreferences() {
1468 return render_view_->GetWebkitPreferences(); 1468 return render_view_->GetWebkitPreferences();
1469 } 1469 }
1470 1470
1471 int RenderFrameImpl::ShowContextMenu(ContextMenuClient* client, 1471 int RenderFrameImpl::ShowContextMenu(ContextMenuClient* client,
1472 const ContextMenuParams& params) { 1472 const ContextMenuParams& params) {
(...skipping 2402 matching lines...) Expand 10 before | Expand all | Expand 10 after
3875 3875
3876 #if defined(ENABLE_BROWSER_CDMS) 3876 #if defined(ENABLE_BROWSER_CDMS)
3877 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3877 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3878 if (!cdm_manager_) 3878 if (!cdm_manager_)
3879 cdm_manager_ = new RendererCdmManager(this); 3879 cdm_manager_ = new RendererCdmManager(this);
3880 return cdm_manager_; 3880 return cdm_manager_;
3881 } 3881 }
3882 #endif // defined(ENABLE_BROWSER_CDMS) 3882 #endif // defined(ENABLE_BROWSER_CDMS)
3883 3883
3884 } // namespace content 3884 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698