| Index: chrome/renderer/render_view.cc
|
| diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
|
| index 964e29241e65f57823f9a33b789adc50a680cdc4..9a7496d830f6af10485339383e20d93c08cc913f 100644
|
| --- a/chrome/renderer/render_view.cc
|
| +++ b/chrome/renderer/render_view.cc
|
| @@ -4483,15 +4483,10 @@ void RenderView::OnZoom(PageZoom::Function function) {
|
| zoomLevelChanged();
|
| }
|
|
|
| -void RenderView::OnSetZoomLevel(double zoom_level) {
|
| - // Don't set zoom level for full-page plugin since they don't use the same
|
| - // zoom settings.
|
| - if (webview()->mainFrame()->document().isPluginDocument())
|
| - return;
|
| -
|
| +void RenderView::OnSetZoomLevel(int request_id, double zoom_level) {
|
| webview()->hidePopups();
|
| webview()->setZoomLevel(false, zoom_level);
|
| - zoomLevelChanged();
|
| + zoomLevelChanged(request_id);
|
| }
|
|
|
| void RenderView::OnSetContentSettingsForLoadingURL(
|
| @@ -5673,12 +5668,17 @@ void RenderView::zoomLimitsChanged(double minimum_level, double maximum_level) {
|
| }
|
|
|
| void RenderView::zoomLevelChanged() {
|
| + // Currently only extension zoom requests have a request id
|
| + zoomLevelChanged(-1);
|
| +}
|
| +
|
| +void RenderView::zoomLevelChanged(int request_id) {
|
| bool remember = !webview()->mainFrame()->document().isPluginDocument();
|
|
|
| // Tell the browser which url got zoomed so it can update the menu and the
|
| // saved values if necessary
|
| Send(new ViewHostMsg_DidZoomURL(
|
| - routing_id_, webview()->zoomLevel(), remember,
|
| + routing_id_, request_id, webview()->zoomLevel(), remember,
|
| GURL(webview()->mainFrame()->url())));
|
| }
|
|
|
|
|