[Spellcheck] Make sure context menu and actual spellcheck state are in sync.

chrome/renderer/spellchecker/spellcheck_provider.cc

 // Copyright (c) 2012 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/spellchecker/spellcheck_provider.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/spellcheck_messages.h"
@@ skipping 32 matching lines @@
                int(SpellCheckResult::SHOWCORRECTIONPANEL), mismatching_enums);
 
 SpellCheckProvider::SpellCheckProvider(
     content::RenderView* render_view,
     SpellCheck* spellcheck)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<SpellCheckProvider>(render_view),
       spelling_panel_visible_(false),
       spellcheck_(spellcheck) {
   DCHECK(spellcheck_);
-  if (render_view)  // NULL in unit tests.
+  if (render_view) { // NULL in unit tests.
     render_view->GetWebView()->setSpellCheckClient(this);
+    EnableSpellCheck(spellcheck_->is_spellcheck_enabled());
+  }
 }
 
 SpellCheckProvider::~SpellCheckProvider() {
 #if defined(OS_MACOSX)
   Send(new SpellCheckHostMsg_DocumentClosed(routing_id(), routing_id()));
 #endif
 }
 
 void SpellCheckProvider::RequestTextChecking(
     const WebString& text,
@@ skipping 39 matching lines @@
 #if !defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_RespondSpellingService,
                         OnRespondSpellingService)
 #endif
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_AdvanceToNextMisspelling,
                         OnAdvanceToNextMisspelling)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_RespondTextCheck, OnRespondTextCheck)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_ToggleSpellPanel, OnToggleSpellPanel)
 #endif
-    IPC_MESSAGE_HANDLER(SpellCheckMsg_ToggleSpellCheck, OnToggleSpellCheck)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SpellCheckProvider::FocusedNodeChanged(const WebKit::WebNode& unused) {
 #if defined(OS_MACOSX)
   bool enabled = false;
   WebKit::WebNode node = render_view()->GetFocusedNode();
   if (!node.isNull())
@@ skipping 163 matching lines @@
   if (!render_view()->GetWebView())
     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.
   spelling_panel_visible_ = is_currently_visible;
   render_view()->GetWebView()->focusedFrame()->executeCommand(
       WebString::fromUTF8("ToggleSpellPanel"));
 }
 #endif
 
-void SpellCheckProvider::OnToggleSpellCheck() {
+void SpellCheckProvider::EnableSpellCheck(bool enable) {
   if (!render_view()->GetWebView())
     return;
 
   WebFrame* frame = render_view()->GetWebView()->focusedFrame();
-  frame->enableContinuousSpellChecking(
-      !frame->isContinuousSpellCheckingEnabled());
+  frame->enableContinuousSpellChecking(enable);
 }
 
 #if !defined(OS_MACOSX)
 bool SpellCheckProvider::SatisfyRequestFromCache(
     const WebString& text,
     WebTextCheckingCompletion* completion) {
   // Cancel this spellcheck request if the cached text is a substring of the
   // given text and the given text is the middle of a possible word.
   string16 request(text);
   size_t text_length = request.length();
@@ skipping 33 matching lines @@
         results[i].replacement = last_results_[i].replacement;
       }
       completion->didFinishCheckingText(results);
       return true;
     }
   }
 
   return false;
 }
 #endif