Merge 37160 - Spellchecker: fix render view autosuggest context menu items...

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 1695 matching lines @@
       routing_id_, frame->url(), UTF16ToWideHack(message), &success,
       &ignored_result));
   return success;
 }
 
 void RenderView::showContextMenu(
     WebFrame* frame, const WebContextMenuData& data) {
   ContextMenuParams params = ContextMenuParams(data);
   if (!params.misspelled_word.empty() && RenderThread::current()) {
     int misspelled_offset, misspelled_length;
-    bool misspelled = RenderThread::current()->spellchecker()->SpellCheckWord(
-          params.misspelled_word.c_str(), params.misspelled_word.size(),
-          document_tag_,
-          &misspelled_offset, &misspelled_length,
-          &params.dictionary_suggestions);
-    if (!misspelled)
+    bool spelled_right = RenderThread::current()->spellchecker()->
+        SpellCheckWord(
+            params.misspelled_word.c_str(), params.misspelled_word.size(),
+            document_tag_,
+            &misspelled_offset, &misspelled_length,
+            &params.dictionary_suggestions);
+    if (spelled_right)
       params.misspelled_word.clear();
   }
 
   Send(new ViewHostMsg_ContextMenu(routing_id_, params));
 }
 
 void RenderView::setStatusText(const WebString& text) {
 }
 
 void RenderView::UpdateTargetURL(const GURL& url, const GURL& fallback_url) {
@@ skipping 2312 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;
 }