Rename various text zoom related stuff to be more generic, since we now can...

chrome/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/bitmap_platform_device_win.h"
 #include "base/gfx/image_operations.h"
 #include "base/gfx/native_theme.h"
 #include "base/gfx/vector_canvas.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/page_zoom.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/common/text_zoom.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/chrome_plugin_host.h"
 #include "chrome/renderer/debug_message_handler.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/renderer_resources.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "chrome/views/message_box_view.h"
@@ skipping 243 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_Undo, OnUndo)
     IPC_MESSAGE_HANDLER(ViewMsg_Redo, OnRedo)
     IPC_MESSAGE_HANDLER(ViewMsg_Cut, OnCut)
     IPC_MESSAGE_HANDLER(ViewMsg_Copy, OnCopy)
     IPC_MESSAGE_HANDLER(ViewMsg_Paste, OnPaste)
     IPC_MESSAGE_HANDLER(ViewMsg_Replace, OnReplace)
     IPC_MESSAGE_HANDLER(ViewMsg_Delete, OnDelete)
     IPC_MESSAGE_HANDLER(ViewMsg_SelectAll, OnSelectAll)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyImageAt, OnCopyImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind)
-    IPC_MESSAGE_HANDLER(ViewMsg_AlterTextSize, OnAlterTextSize)
+    IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
     IPC_MESSAGE_HANDLER(ViewMsg_InspectElement, OnInspectElement)
     IPC_MESSAGE_HANDLER(ViewMsg_ShowJavaScriptConsole, OnShowJavaScriptConsole)
     IPC_MESSAGE_HANDLER(ViewMsg_DownloadImage, OnDownloadImage)
     IPC_MESSAGE_HANDLER(ViewMsg_ScriptEvalRequest, OnScriptEvalRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_AddMessageToConsole, OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ViewMsg_DebugAttach, OnDebugAttach)
     IPC_MESSAGE_HANDLER(ViewMsg_DebugDetach, OnDebugDetach)
     IPC_MESSAGE_HANDLER(ViewMsg_ReservePageIDRange, OnReservePageIDRange)
     IPC_MESSAGE_HANDLER(ViewMsg_UploadFile, OnUploadFileRequest)
@@ skipping 1849 matching lines @@
 }
 
 void RenderView::UserMetricsRecordAction(const std::wstring& action) {
   Send(new ViewHostMsg_UserMetricsRecordAction(routing_id_, action));
 }
 
 void RenderView::DnsPrefetch(const std::vector<std::string>& host_names) {
   Send(new ViewHostMsg_DnsPrefetch(host_names));
 }
 
-void RenderView::OnAlterTextSize(int size) {
-  switch (size) {
-    case text_zoom::TEXT_SMALLER:
-      webview()->MakeTextSmaller();
+void RenderView::OnZoom(int function) {
+  static const bool kZoomIsTextOnly = false;
+  switch (function) {
+    case PageZoom::SMALLER:
+      webview()->ZoomIn(kZoomIsTextOnly);
       break;
-    case text_zoom::TEXT_STANDARD:
-      webview()->MakeTextStandardSize();
+    case PageZoom::STANDARD:
+      webview()->ResetZoom();
       break;
-    case text_zoom::TEXT_LARGER:
-      webview()->MakeTextLarger();
+    case PageZoom::LARGER:
+      webview()->ZoomIn(kZoomIsTextOnly);
       break;
     default:
       NOTREACHED();
   }
 }
 
 void RenderView::OnSetPageEncoding(const std::wstring& encoding_name) {
   webview()->SetPageEncoding(encoding_name);
 }
 
@@ skipping 381 matching lines @@
 
   if (template_html.empty()) {
     NOTREACHED() << "unable to load template. ID: " << template_resource_id;
     return "";
   }
   // "t" is the id of the templates root node.
   return jstemplate_builder::GetTemplateHtml(
       template_html, &error_strings, "t");
 }