diff options
| author | wjmaclean <wjmaclean@chromium.org> | 2015-04-01 15:53:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-01 22:54:31 +0000 |
| commit | a9373cadd74221c6aaa77ca5b5fc2e7e7f5c4ed7 (patch) | |
| tree | 81e10489e745dc4a10140ef83173365772042f09 /components/ui/zoom | |
| parent | 5ee99f2860ecf2e167e0b8bed156f466e1b077ec (diff) | |
| download | chromium_src-a9373cadd74221c6aaa77ca5b5fc2e7e7f5c4ed7.zip chromium_src-a9373cadd74221c6aaa77ca5b5fc2e7e7f5c4ed7.tar.gz chromium_src-a9373cadd74221c6aaa77ca5b5fc2e7e7f5c4ed7.tar.bz2 | |
Make disabled-mode zoom event send correct new zoom level.
Modify ZoomController so that when we enter ZOOM_MODE_DISABLED we send
the correct value for new zoom level in the ZoomChangedEventData.
BUG=472621
Review URL: https://codereview.chromium.org/1054703002
Cr-Commit-Position: refs/heads/master@{#323353}
Diffstat (limited to 'components/ui/zoom')
| -rw-r--r-- | components/ui/zoom/zoom_controller.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/ui/zoom/zoom_controller.cc b/components/ui/zoom/zoom_controller.cc index 14a5700..1bd965b 100644 --- a/components/ui/zoom/zoom_controller.cc +++ b/components/ui/zoom/zoom_controller.cc @@ -243,8 +243,10 @@ void ZoomController::SetZoomMode(ZoomMode new_mode) { } case ZOOM_MODE_DISABLED: { // The page needs to be zoomed back to default before disabling the zoom + double new_zoom_level = GetDefaultZoomLevel(); + event_data_->new_zoom_level = new_zoom_level; zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id, - GetDefaultZoomLevel()); + new_zoom_level); break; } } |