| 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 8850f6abe33db77f19bac9c557634aa7c9d28489..3b7c0f2f0bf91867aebf89ba1e5c1a5d2c858eb0 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -896,13 +896,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,
|
| @@ -3079,7 +3072,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 {
|
| @@ -3598,7 +3592,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_);
|
| }
|
| }
|
|
|