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

Unified Diff: extensions/browser/guest_view/guest_view_base.cc

Issue 525793002: Make WebContentsObserver::web_contents() public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed 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 side-by-side diff with in-line comments
Download patch
Index: extensions/browser/guest_view/guest_view_base.cc
diff --git a/extensions/browser/guest_view/guest_view_base.cc b/extensions/browser/guest_view/guest_view_base.cc
index 44b6899c951742592125df0fa2906cd385f5ed9b..48a2147c1ab393d93f070edeb1cbebe1e129fbd5 100644
--- a/extensions/browser/guest_view/guest_view_base.cc
+++ b/extensions/browser/guest_view/guest_view_base.cc
@@ -193,7 +193,7 @@ void GuestViewBase::SetAutoSize(bool enabled,
if (!attached())
return;
- content::RenderViewHost* rvh = guest_web_contents()->GetRenderViewHost();
+ content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
if (auto_size_enabled_) {
rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
} else {
@@ -289,7 +289,7 @@ void GuestViewBase::RenderProcessExited(content::RenderProcessHost* host,
}
void GuestViewBase::Destroy() {
- DCHECK(guest_web_contents());
+ DCHECK(web_contents());
content::RenderProcessHost* host =
content::RenderProcessHost::FromID(embedder_render_process_id());
if (host)
@@ -298,12 +298,12 @@ void GuestViewBase::Destroy() {
if (!destruction_callback_.is_null())
destruction_callback_.Run();
- webcontents_guestview_map.Get().erase(guest_web_contents());
+ webcontents_guestview_map.Get().erase(web_contents());
GuestViewManager::FromBrowserContext(browser_context_)->
RemoveGuest(guest_instance_id_);
pending_events_.clear();
- delete guest_web_contents();
+ delete web_contents();
}
void GuestViewBase::DidAttach() {
@@ -370,7 +370,7 @@ void GuestViewBase::DidStopLoading(content::RenderViewHost* render_view_host) {
void GuestViewBase::RenderViewReady() {
GuestReady();
- content::RenderViewHost* rvh = guest_web_contents()->GetRenderViewHost();
+ content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
if (auto_size_enabled_) {
rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
} else {
« no previous file with comments | « extensions/browser/guest_view/guest_view_base.h ('k') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698