Move some more methods from WebViewDelegate to WebViewClient....

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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>
 
@@ skipping 256 matching lines @@
 
 /*static*/
 void RenderView::SetNextPageID(int32 next_page_id) {
   // This method should only be called during process startup, and the given
   // page id had better not exceed our current next page id!
   DCHECK_EQ(next_page_id_, 1);
   DCHECK(next_page_id >= next_page_id_);
   next_page_id_ = next_page_id;
 }
 
+void RenderView::UserMetricsRecordAction(const std::wstring& action) {
+  Send(new ViewHostMsg_UserMetricsRecordAction(routing_id_, action));
+}
+
 void RenderView::PluginCrashed(base::ProcessId pid,
                                const FilePath& plugin_path) {
   Send(new ViewHostMsg_CrashedPlugin(routing_id_, pid, plugin_path));
 }
 
 void RenderView::Init(gfx::NativeViewId parent_hwnd,
                       base::WaitableEvent* modal_dialog_event,
                       int32 opener_id,
                       const RendererPreferences& renderer_prefs,
                       SharedRenderViewCounter* counter,
@@ skipping 1219 matching lines @@
 
 void RenderView::didExecuteCommand(const WebString& command_name) {
   const std::wstring& name = UTF16ToWideHack(command_name);
   if (StartsWith(name, L"Move", true) ||
       StartsWith(name, L"Insert", true) ||
       StartsWith(name, L"Delete", true))
     return;
   UserMetricsRecordAction(name);
 }
 
+void RenderView::spellCheck(
+    const WebString& text, int& misspelled_offset, int& misspelled_length) {
+  EnsureDocumentTag();
+  Send(new ViewHostMsg_SpellCheck(
+      routing_id_, UTF16ToWideHack(text), document_tag_,
+      &misspelled_offset, &misspelled_length));
+}
+
+WebString RenderView::autoCorrectWord(const WebKit::WebString& word) {
+  std::wstring autocorrect_word;
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kAutoSpellCorrect)) {
+    EnsureDocumentTag();
+    Send(new ViewHostMsg_GetAutoCorrectWord(
+        routing_id_, UTF16ToWideHack(word), document_tag_, &autocorrect_word));
+  }
+  return WideToUTF16Hack(autocorrect_word);
+}
+
+void RenderView::updateSpellingUIWithMisspelledWord(const WebString& word) {
+  Send(new ViewHostMsg_UpdateSpellingPanelWithMisspelledWord(
+      routing_id_, UTF16ToWideHack(word)));
+}
+
 void RenderView::runModalAlertDialog(
     WebFrame* frame, const WebString& message) {
   RunJavaScriptMessage(MessageBoxFlags::kIsJavascriptAlert,
                        UTF16ToWideHack(message),
                        std::wstring(),
                        frame->url(),
                        NULL);
 }
 
 bool RenderView::runModalConfirmDialog(
@@ skipping 1140 matching lines @@
                                   -1,
                                   selection_rect,
                                   active_match_ordinal,
                                   false));
 }
 
 bool RenderView::WasOpenedByUserGesture() const {
   return opened_by_user_gesture_;
 }
 
-void RenderView::SpellCheck(const std::wstring& word,
-                            int* misspell_location,
-                            int* misspell_length) {
-  EnsureDocumentTag();
-  Send(new ViewHostMsg_SpellCheck(
-      routing_id_, word, document_tag_, misspell_location, misspell_length));
-}
-
-std::wstring RenderView::GetAutoCorrectWord(
-    const std::wstring& misspelled_word) {
-  std::wstring autocorrect_word;
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kAutoSpellCorrect)) {
-    EnsureDocumentTag();
-    Send(new ViewHostMsg_GetAutoCorrectWord(
-        routing_id_, misspelled_word, document_tag_, &autocorrect_word));
-  }
-  return autocorrect_word;
-}
-
-void RenderView::ShowSpellingUI(bool show) {
-  Send(new ViewHostMsg_ShowSpellingPanel(routing_id_, show));
-}
-
-void RenderView::UpdateSpellingUIWithMisspelledWord(const std::wstring& word) {
-  Send(new ViewHostMsg_UpdateSpellingPanelWithMisspelledWord(
-      routing_id_, word));
-}
-
-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::OnZoom(int function) {
   static const bool kZoomIsTextOnly = false;
   switch (function) {
     case PageZoom::SMALLER:
       webview()->ZoomOut(kZoomIsTextOnly);
       break;
@@ skipping 855 matching lines @@
   // TODO(darin): There's actually no reason for this to be here.  We should
   // have the browser side manage the document tag.
 #if defined(OS_MACOSX)
   if (!has_document_tag_) {
     // Make the call to get the tag.
     Send(new ViewHostMsg_GetDocumentTag(routing_id_, &document_tag_));
     has_document_tag_ = true;
   }
 #endif
 }