Added support for Text only zoom...

chrome/browser/views/tab_contents/tab_contents_view_win.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/os_exchange_data.h"
@@ skipping 465 matching lines @@
 // A message is reflected here from view().
 // Return non-zero to indicate that it is handled here.
 // Return 0 to allow view() to further process it.
 LRESULT TabContentsViewWin::OnReflectedMessage(UINT msg, WPARAM w_param,
                                         LPARAM l_param) {
   MSG* message = reinterpret_cast<MSG*>(l_param);
   switch (message->message) {
     case WM_MOUSEWHEEL:
       // This message is reflected from the view() to this window.
       if (GET_KEYSTATE_WPARAM(message->wParam) & MK_CONTROL) {
-        WheelZoom(GET_WHEEL_DELTA_WPARAM(message->wParam));
+        PageZoom::Function zoom_type;
+        const bool zoom_in = GET_WHEEL_DELTA_WPARAM(message->wParam) > 0;
+
+        if (GET_KEYSTATE_WPARAM(message->wParam) & MK_SHIFT) {
+          zoom_type = zoom_in ? PageZoom::TEXT_ONLY_LARGER :
+                                PageZoom::TEXT_ONLY_SMALLER;
+        } else {
+          zoom_type = zoom_in ? PageZoom::LARGER : PageZoom::SMALLER;
+        }
+
+        WheelZoom(zoom_type);
         return 1;
       }
       break;
     case WM_HSCROLL:
     case WM_VSCROLL:
       if (ScrollZoom(LOWORD(message->wParam)))
         return 1;
     default:
       break;
   }
@@ skipping 88 matching lines @@
 bool TabContentsViewWin::ScrollZoom(int scroll_type) {
   // If ctrl is held, zoom the UI.  There are three issues with this:
   // 1) Should the event be eaten or forwarded to content?  We eat the event,
   //    which is like Firefox and unlike IE.
   // 2) Should wheel up zoom in or out?  We zoom in (increase font size), which
   //    is like IE and Google maps, but unlike Firefox.
   // 3) Should the mouse have to be over the content area?  We zoom as long as
   //    content has focus, although FF and IE require that the mouse is over
   //    content.  This is because all events get forwarded when content has
   //    focus.
+  const int zoom_text_only = GetAsyncKeyState(VK_SHIFT) & 0x8000;
+
   if (GetAsyncKeyState(VK_CONTROL) & 0x8000) {
-    int distance = 0;
+    PageZoom::Function zoom_type;
     switch (scroll_type) {
       case SB_LINEUP:
-        distance = WHEEL_DELTA;
+        zoom_type = zoom_text_only ? PageZoom::TEXT_ONLY_LARGER :
+                                     PageZoom::LARGER;
         break;
       case SB_LINEDOWN:
-        distance = -WHEEL_DELTA;
+        zoom_type = zoom_text_only ? PageZoom::TEXT_ONLY_SMALLER :
+                                     PageZoom::SMALLER;
         break;
         // TODO(joshia): Handle SB_PAGEUP, SB_PAGEDOWN, SB_THUMBPOSITION,
         // and SB_THUMBTRACK for completeness
       default:
-        break;
+        return false;
     }
 
-    WheelZoom(distance);
+    WheelZoom(zoom_type);
     return true;
   }
   return false;
 }
 
-void TabContentsViewWin::WheelZoom(int distance) {
-  if (tab_contents()->delegate()) {
-    bool zoom_in = distance > 0;
-    tab_contents()->delegate()->ContentsZoomChange(zoom_in);
-  }
+void TabContentsViewWin::WheelZoom(PageZoom::Function zoom_type) {
+  if (tab_contents()->delegate())
+    tab_contents()->delegate()->ContentsZoomChange(zoom_type);
 }