diff options
| author | wjmaclean <wjmaclean@chromium.org> | 2015-04-09 09:12:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-09 16:13:00 +0000 |
| commit | 37d3af9866aeb1f1cf175cea91cf5aa4b4f58b2a (patch) | |
| tree | a5658af787f553eed6d37b3313e57e85bd90026c /extensions/browser | |
| parent | a0d5af8283af97dc3a464605485c65ba8fe4cbcb (diff) | |
| download | chromium_src-37d3af9866aeb1f1cf175cea91cf5aa4b4f58b2a.zip chromium_src-37d3af9866aeb1f1cf175cea91cf5aa4b4f58b2a.tar.gz chromium_src-37d3af9866aeb1f1cf175cea91cf5aa4b4f58b2a.tar.bz2 | |
Zoom propagation on navigation should respect settings.
The changes made in https://codereview.chromium.org/1009193003 failed
to check the current settings about whether or not embedder zoom should
propagate to the guest. This CL corrects that.
BUG=474452
Review URL: https://codereview.chromium.org/1070113004
Cr-Commit-Position: refs/heads/master@{#324451}
Diffstat (limited to 'extensions/browser')
| -rw-r--r-- | extensions/browser/guest_view/guest_view_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/browser/guest_view/guest_view_base.cc b/extensions/browser/guest_view/guest_view_base.cc index bbbc5cc..8b8c7f2 100644 --- a/extensions/browser/guest_view/guest_view_base.cc +++ b/extensions/browser/guest_view/guest_view_base.cc @@ -592,7 +592,7 @@ void GuestViewBase::WebContentsDestroyed() { void GuestViewBase::DidNavigateMainFrame( const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) { - if (attached()) + if (attached() && ZoomPropagatesFromEmbedderToGuest()) SetGuestZoomLevelToMatchEmbedder(); } |