summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 19:24:43 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 19:24:43 +0000
commit1dfa6aa6e1c0bb2e6208c9dbb1ba6572d4b077de (patch)
tree4bf2a190b26cbeaa8084be8aa3712884d8332da2
parenta99ec3b662cbbc6a260ab9a38993f06e22e8498f (diff)
downloadchromium_src-1dfa6aa6e1c0bb2e6208c9dbb1ba6572d4b077de.zip
chromium_src-1dfa6aa6e1c0bb2e6208c9dbb1ba6572d4b077de.tar.gz
chromium_src-1dfa6aa6e1c0bb2e6208c9dbb1ba6572d4b077de.tar.bz2
Make zomm do full page zoom instead of just text zoom.
Review URL: http://codereview.chromium.org/7314 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3359 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd2
-rw-r--r--webkit/glue/webview_impl.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 46b061b..2f0254f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -369,7 +369,7 @@ each locale. -->
&amp;Print...
</message>
<message name="IDS_ZOOM" desc="The text label of the Zoom submenu" >
- Text &amp;zoom
+ &amp;Zoom
</message>
<message name="IDS_ZOOM_PLUS" desc="The text label of the Make Text Larger menu item" >
&amp;Larger
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 1599e8a..da53eb6 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1166,7 +1166,7 @@ void WebViewImpl::MakeTextLarger() {
float zoom_factor = static_cast<float>(multiplier);
if (zoom_factor != frame->zoomFactor()) {
++text_zoom_level_;
- frame->setZoomFactor(zoom_factor, true);
+ frame->setZoomFactor(zoom_factor, false);
}
}
@@ -1178,13 +1178,13 @@ void WebViewImpl::MakeTextSmaller() {
float zoom_factor = static_cast<float>(multiplier);
if (zoom_factor != frame->zoomFactor()) {
--text_zoom_level_;
- frame->setZoomFactor(zoom_factor, true);
+ frame->setZoomFactor(zoom_factor, false);
}
}
void WebViewImpl::MakeTextStandardSize() {
text_zoom_level_ = 0;
- main_frame()->frame()->setZoomFactor(1.0f, true);
+ main_frame()->frame()->setZoomFactor(1.0f, false);
}
void WebViewImpl::CopyImageAt(int x, int y) {