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

Unified Diff: content/browser/tab_contents/tab_contents_view_helper.cc

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 8 years, 10 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: content/browser/tab_contents/tab_contents_view_helper.cc
diff --git a/content/browser/tab_contents/tab_contents_view_helper.cc b/content/browser/tab_contents/tab_contents_view_helper.cc
index 72bccb0cc3113f005714ae3e121fdff06ff23374..69c21c190ae210070056f7bd1e062f3221ca647e 100644
--- a/content/browser/tab_contents/tab_contents_view_helper.cc
+++ b/content/browser/tab_contents/tab_contents_view_helper.cc
@@ -36,7 +36,7 @@ void TabContentsViewHelper::Observe(
RenderWidgetHost* host = content::Source<RenderWidgetHost>(source).ptr();
for (PendingWidgetViews::iterator i = pending_widget_views_.begin();
i != pending_widget_views_.end(); ++i) {
- if (host->view() == i->second) {
+ if (host->GetView() == i->second) {
pending_widget_views_.erase(i);
break;
}
@@ -119,11 +119,11 @@ TabContents* TabContentsViewHelper::GetCreatedWindow(int route_id) {
pending_contents_.erase(route_id);
if (!new_contents->GetRenderProcessHost()->HasConnection() ||
- !new_contents->GetRenderViewHost()->view())
+ !new_contents->GetRenderViewHost()->GetView())
return NULL;
// TODO(brettw): It seems bogus to reach into here and initialize the host.
- new_contents->GetRenderViewHost()->Init();
+ static_cast<RenderViewHostImpl*>(new_contents->GetRenderViewHost())->Init();
return new_contents;
}
@@ -138,7 +138,7 @@ RenderWidgetHostView* TabContentsViewHelper::GetCreatedWidget(int route_id) {
pending_widget_views_.erase(route_id);
RenderWidgetHost* widget_host = widget_host_view->GetRenderWidgetHost();
- if (!widget_host->process()->HasConnection()) {
+ if (!widget_host->GetProcess()->HasConnection()) {
// The view has gone away or the renderer crashed. Nothing to do.
return NULL;
}
@@ -178,6 +178,6 @@ RenderWidgetHostView* TabContentsViewHelper::ShowCreatedWidget(
widget_host_view->InitAsPopup(web_contents->GetRenderWidgetHostView(),
initial_pos);
}
- RenderWidgetHostImpl::FromRWHV(widget_host_view)->Init();
+ RenderWidgetHostImpl::From(widget_host_view->GetRenderWidgetHost())->Init();
return widget_host_view;
}
« no previous file with comments | « content/browser/tab_contents/tab_contents_view_gtk.cc ('k') | content/browser/tab_contents/tab_contents_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698