Synchronize the check status of the "Check Spelling While Typing" item.

chrome/browser/tab_contents/spellchecker_submenu_observer_mac.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/browser/tab_contents/spellchecker_submenu_observer.h"
 
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h"
@@ skipping 66 matching lines @@
 
   return false;
 }
 
 bool SpellCheckerSubMenuObserver::IsCommandIdChecked(int command_id) {
   DCHECK(IsCommandIdSupported(command_id));
 
   // Check box for 'Check Spelling while typing'.
   if (command_id == IDC_CHECK_SPELLING_WHILE_TYPING) {
     Profile* profile = proxy_->GetProfile();
-    if (!profile || !profile->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck))
-      return false;
-    return check_spelling_while_typing_;

[jeremy, 2012/06/13 17:43:30]

If we're just reading this straight from the prefs, I'm just guessing we can
remove this member variable from the class now?

[Hironori Bono, 2012/06/14 08:16:03]

Thanks for noticing it. Yes, we can remove it. I have updated my change to
remove unnecessary variables on all platforms.

+    return profile->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck);

[jeremy, 2012/06/13 17:43:30]

Are you sure that removing the Null check here is OK?

[Hironori Bono, 2012/06/14 08:16:03]

Thanks for noticing it. Even though I somehow removed a NULL check from my
previous change, I tested this code and noticed I needed a NULL check here (at
least on Linux).

   }
 
   return false;
 }
 
 bool SpellCheckerSubMenuObserver::IsCommandIdEnabled(int command_id) {
   DCHECK(IsCommandIdSupported(command_id));
 
   Profile* profile = proxy_->GetProfile();
   if (!profile)
     return false;
 
-  const PrefService* pref = profile->GetPrefs();
-
   switch (command_id) {
     case IDC_CHECK_SPELLING_WHILE_TYPING:
-      return pref->GetBoolean(prefs::kEnableSpellCheck);
-
     case IDC_SPELLPANEL_TOGGLE:
     case IDC_SPELLCHECK_MENU:
     case IDC_CONTENT_CONTEXT_SPELLING_TOGGLE:
       return true;
   }
 
   return false;
 }
 
 void SpellCheckerSubMenuObserver::ExecuteCommand(int command_id) {
   DCHECK(IsCommandIdSupported(command_id));
 
   content::RenderViewHost* rvh = proxy_->GetRenderViewHost();
+  Profile* profile = proxy_->GetProfile();
   switch (command_id) {
     case IDC_CHECK_SPELLING_WHILE_TYPING:
+      profile->GetPrefs()->SetBoolean(
+          prefs::kEnableSpellCheck,
+          !profile->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck));
       rvh->Send(new SpellCheckMsg_ToggleSpellCheck(rvh->GetRoutingID()));
       break;
 
     case IDC_SPELLPANEL_TOGGLE:
       rvh->Send(new SpellCheckMsg_ToggleSpellPanel(
           rvh->GetRoutingID(), spellcheck_mac::SpellingPanelVisible()));
       break;
   }
 }