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

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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/shared_worker_repository.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after
1453 } 1453 }
1454 1454
1455 RenderView* RenderFrameImpl::GetRenderView() { 1455 RenderView* RenderFrameImpl::GetRenderView() {
1456 return render_view_.get(); 1456 return render_view_.get();
1457 } 1457 }
1458 1458
1459 int RenderFrameImpl::GetRoutingID() { 1459 int RenderFrameImpl::GetRoutingID() {
1460 return routing_id_; 1460 return routing_id_;
1461 } 1461 }
1462 1462
1463 blink::WebFrame* RenderFrameImpl::GetWebFrame() { 1463 blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
1464 DCHECK(frame_); 1464 DCHECK(frame_);
1465 return frame_; 1465 return frame_;
1466 } 1466 }
1467 1467
1468 WebPreferences& RenderFrameImpl::GetWebkitPreferences() { 1468 WebPreferences& RenderFrameImpl::GetWebkitPreferences() {
1469 return render_view_->GetWebkitPreferences(); 1469 return render_view_->GetWebkitPreferences();
1470 } 1470 }
1471 1471
1472 int RenderFrameImpl::ShowContextMenu(ContextMenuClient* client, 1472 int RenderFrameImpl::ShowContextMenu(ContextMenuClient* client,
1473 const ContextMenuParams& params) { 1473 const ContextMenuParams& params) {
(...skipping 2409 matching lines...) Expand 10 before | Expand all | Expand 10 after
3883 3883
3884 #if defined(ENABLE_BROWSER_CDMS) 3884 #if defined(ENABLE_BROWSER_CDMS)
3885 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3885 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3886 if (!cdm_manager_) 3886 if (!cdm_manager_)
3887 cdm_manager_ = new RendererCdmManager(this); 3887 cdm_manager_ = new RendererCdmManager(this);
3888 return cdm_manager_; 3888 return cdm_manager_;
3889 } 3889 }
3890 #endif // defined(ENABLE_BROWSER_CDMS) 3890 #endif // defined(ENABLE_BROWSER_CDMS)
3891 3891
3892 } // namespace content 3892 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/shared_worker_repository.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698