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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2515823002: Remove WebContents::GetRoutingID(). (Closed)
Patch Set: add render_view_host.h include in resource_dispatcher_host_unittest.cc Created 4 years, 1 month 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index d6accb2b10445fda5a5fdab38ac9d4acb3a40711..46a226f7c67434387fa3d2765c8253817d999130 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -897,13 +897,6 @@ RenderViewHostImpl* WebContentsImpl::GetRenderViewHost() const {
return GetRenderManager()->current_host();
}
-int WebContentsImpl::GetRoutingID() const {
- if (!GetRenderViewHost())
- return MSG_ROUTING_NONE;
-
- return GetRenderViewHost()->GetRoutingID();
-}
-
void WebContentsImpl::CancelActiveAndPendingDialogs() {
if (dialog_manager_) {
dialog_manager_->CancelDialogs(this,
@@ -3084,7 +3077,8 @@ int WebContentsImpl::GetMaximumZoomPercent() const {
}
void WebContentsImpl::SetPageScale(float page_scale_factor) {
- Send(new ViewMsg_SetPageScale(GetRoutingID(), page_scale_factor));
+ Send(new ViewMsg_SetPageScale(GetRenderViewHost()->GetRoutingID(),
+ page_scale_factor));
}
gfx::Size WebContentsImpl::GetPreferredSize() const {
@@ -3603,7 +3597,7 @@ void WebContentsImpl::OnPageScaleFactorChanged(float page_scale_factor) {
if (host_zoom_map && GetRenderProcessHost()) {
host_zoom_map->SetPageScaleFactorIsOneForView(
- GetRenderProcessHost()->GetID(), GetRoutingID(),
+ GetRenderProcessHost()->GetID(), GetRenderViewHost()->GetRoutingID(),
page_scale_factor_is_one_);
}
}
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698