More WebView / WebViewDelegate cleanup.

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 201 matching lines @@
       opened_by_user_gesture_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       devtools_agent_(NULL),
       devtools_client_(NULL),
       history_back_list_count_(0),
       history_forward_list_count_(0),
       has_unload_listener_(false),
       decrement_shared_popup_at_destruction_(false),
       form_field_autofill_request_id_(0),
       popup_notification_visible_(false),
+      spelling_panel_visible_(false),
       delay_seconds_for_form_state_sync_(kDefaultDelaySecondsForFormStateSync),
       preferred_width_(0),
       send_preferred_width_changes_(false),
       determine_page_text_after_loading_stops_(false),
       view_type_(ViewType::INVALID),
       browser_window_id_(-1),
       last_top_level_navigation_page_id_(-1),
 #if defined(OS_MACOSX)
       has_document_tag_(false),
 #endif
@@ skipping 648 matching lines @@
     return;
   webview()->focusedFrame()->executeCommand(
       WebString::fromUTF8("AdvanceToNextMisspelling"));
 }
 
 void RenderView::OnToggleSpellPanel(bool is_currently_visible) {
   if (!webview())
     return;
   // We need to tell the webView whether the spelling panel is visible or not so
   // that it won't need to make ipc calls later.
-  webview()->SetSpellingPanelVisibility(is_currently_visible);
+  spelling_panel_visible_ = is_currently_visible;
   webview()->focusedFrame()->executeCommand(
       WebString::fromUTF8("ToggleSpellPanel"));
 }
 
 void RenderView::OnToggleSpellCheck() {
   if (!webview())
     return;
 
   WebFrame* frame = webview()->focusedFrame();
   frame->enableContinuousSpellChecking(
@@ skipping 640 matching lines @@
     Send(new ViewHostMsg_GetAutoCorrectWord(
         routing_id_, UTF16ToWideHack(word), document_tag_, &autocorrect_word));
   }
   return WideToUTF16Hack(autocorrect_word);
 }
 
 void RenderView::showSpellingUI(bool show) {
   Send(new ViewHostMsg_ShowSpellingPanel(routing_id_, show));
 }
 
+bool RenderView::isShowingSpellingUI() {
+  return spelling_panel_visible_;
+}
+
 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(),
@@ skipping 108 matching lines @@
 
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
   DCHECK(navigation_state);
   if (navigation_state->transition_type() == PageTransition::START_PAGE)
     return;
 
   history_back_list_count_++;
   history_forward_list_count_ = 0;
 }
 
+void RenderView::didUpdateInspectorSettings() {
+  Send(new ViewHostMsg_UpdateInspectorSettings(
+      routing_id_, webview()->inspectorSettings().utf8()));
+}
+
 // WebKit::WebWidgetClient ----------------------------------------------------
 
 // We are supposed to get a single call to Show for a newly created RenderView
 // that was created via RenderView::CreateWebView.  So, we wait until this
 // point to dispatch the ShowView message.
 //
 // This method provides us with the information about how to display the newly
 // created RenderView (i.e., as a constrained popup or as a new tab).
 //
 void RenderView::show(WebNavigationPolicy policy) {
@@ skipping 624 matching lines @@
     // cache the width and only send the IPC message when we're sure the
     // width is different.
     int width = webview()->mainFrame()->contentsPreferredWidth();
     if (width != preferred_width_) {
       Send(new ViewHostMsg_DidContentsPreferredWidthChange(routing_id_, width));
       preferred_width_ = width;
     }
   }
 }
 
+void RenderView::reportFindInPageMatchCount(int request_id, int count,
+                                            bool final_update) {
+  // If we have a message that has been queued up, then we should just replace
+  // it. The ACK from the browser will make sure it gets sent when the browser
+  // wants it.
+  if (queued_find_reply_message_.get()) {
+    IPC::Message* msg = new ViewHostMsg_Find_Reply(
+        routing_id_,
+        request_id,
+        count,
+        gfx::Rect(),
+        -1,  // Don't update active match ordinal.
+        final_update);
+    queued_find_reply_message_.reset(msg);
+  } else {
+    // Send the search result over to the browser process.
+    Send(new ViewHostMsg_Find_Reply(
+        routing_id_,
+        request_id,
+        count,
+        gfx::Rect(),
+        -1,  // // Don't update active match ordinal.
+        final_update));
+  }
+}
+
+void RenderView::reportFindInPageSelection(int request_id,
+                                           int active_match_ordinal,
+                                           const WebRect& selection_rect) {
+  // Send the search result over to the browser process.
+  Send(new ViewHostMsg_Find_Reply(routing_id_,
+                                  request_id,
+                                  -1,
+                                  selection_rect,
+                                  active_match_ordinal,
+                                  false));
+}
+
 // webkit_glue::WebPluginPageDelegate -----------------------------------------
 
 webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate(
     const GURL& url,
     const std::string& mime_type,
     std::string* actual_mime_type) {
   if (!PluginChannelHost::IsListening())
     return NULL;
 
   GURL policy_url;
@@ skipping 361 matching lines @@
     Send(new ViewMsg_DeterminePageText_Reply(routing_id_, contents));
     determine_page_text_after_loading_stops_ = false;
     return;
   }
 
   // We set |determine_page_text_after_loading_stops_| true here so that,
   // after page has been loaded completely, the text in the page is captured.
   determine_page_text_after_loading_stops_ = true;
 }
 
-void RenderView::ReportFindInPageMatchCount(int count, int request_id,
-                                            bool final_update) {
-  // If we have a message that has been queued up, then we should just replace
-  // it. The ACK from the browser will make sure it gets sent when the browser
-  // wants it.
-  if (queued_find_reply_message_.get()) {
-    IPC::Message* msg = new ViewHostMsg_Find_Reply(
-        routing_id_,
-        request_id,
-        count,
-        gfx::Rect(),
-        -1,  // Don't update active match ordinal.
-        final_update);
-    queued_find_reply_message_.reset(msg);
-  } else {
-    // Send the search result over to the browser process.
-    Send(new ViewHostMsg_Find_Reply(
-        routing_id_,
-        request_id,
-        count,
-        gfx::Rect(),
-        -1,  // // Don't update active match ordinal.
-        final_update));
-  }
-}
-
-void RenderView::ReportFindInPageSelection(int request_id,
-                                           int active_match_ordinal,
-                                           const WebRect& selection_rect) {
-  // Send the search result over to the browser process.
-  Send(new ViewHostMsg_Find_Reply(routing_id_,
-                                  request_id,
-                                  -1,
-                                  selection_rect,
-                                  active_match_ordinal,
-                                  false));
-}
-
 bool RenderView::WasOpenedByUserGesture() const {
   return opened_by_user_gesture_;
 }
 
 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;
@@ skipping 14 matching lines @@
 
 void RenderView::OnSetPageEncoding(const std::string& encoding_name) {
   webview()->setPageEncoding(WebString::fromUTF8(encoding_name));
 }
 
 void RenderView::OnResetPageEncodingToDefault() {
   WebString no_encoding;
   webview()->setPageEncoding(no_encoding);
 }
 
-void RenderView::UpdateInspectorSettings(const std::wstring& raw_settings) {
-  Send(new ViewHostMsg_UpdateInspectorSettings(routing_id_, raw_settings));
-}
-
 WebDevToolsAgentDelegate* RenderView::GetWebDevToolsAgentDelegate() {
   return devtools_agent_.get();
 }
 
 WebFrame* RenderView::GetChildFrame(const std::wstring& xpath) const {
   if (xpath.empty())
     return webview()->mainFrame();
 
   // xpath string can represent a frame deep down the tree (across multiple
   // frame DOMs).
@@ skipping 824 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }