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

chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.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/browser_process.h"
 #include "chrome/browser/prefs/pref_member.h"
@@ skipping 10 matching lines @@
 #include "ui/base/models/simple_menu_model.h"
 
 using content::BrowserThread;
 
 SpellCheckerSubMenuObserver::SpellCheckerSubMenuObserver(
     RenderViewContextMenuProxy* proxy,
     ui::SimpleMenuModel::Delegate* delegate,
     int group)
     : proxy_(proxy),
       submenu_model_(delegate),
-      spellcheck_enabled_(false),
       language_group_(group),
       language_selected_(0) {
   DCHECK(proxy_);
 }
 
 SpellCheckerSubMenuObserver::~SpellCheckerSubMenuObserver() {
 }
 
 void SpellCheckerSubMenuObserver::InitMenu(
     const content::ContextMenuParams& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  spellcheck_enabled_ = params.spellcheck_enabled;
-
   // Add available spell-checker languages to the sub menu.
   Profile* profile = proxy_->GetProfile();
   language_selected_ =
       SpellCheckHost::GetSpellCheckLanguages(profile, &languages_);
   DCHECK(languages_.size() <
          IDC_SPELLCHECK_LANGUAGES_LAST - IDC_SPELLCHECK_LANGUAGES_FIRST);
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   for (size_t i = 0; i < languages_.size(); ++i) {
     string16 display_name(
         l10n_util::GetDisplayNameForLocale(languages_[i], app_locale, true));
@@ skipping 52 matching lines @@
   DCHECK(IsCommandIdSupported(command_id));
 
   if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
       command_id < IDC_SPELLCHECK_LANGUAGES_LAST) {
     return language_selected_ == command_id - IDC_SPELLCHECK_LANGUAGES_FIRST;
   }
 
   // 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 spellcheck_enabled_;
+    return profile && profile->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck);

[jeremy, 2012/06/14 14:49:50]

nit: can you be more explicite here:

if (!profile)
  return false;
return profile->...

[Hironori Bono, 2012/06/18 07:23:55]

Thanks for your comment. I have added a DCHECK() since I have fixed my test and
this profile does not become NULL any more.

   }
 
   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();
   if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
       command_id < IDC_SPELLCHECK_LANGUAGES_LAST) {
     return pref->GetBoolean(prefs::kEnableSpellCheck);
   }
 
   switch (command_id) {
     case IDC_CHECK_SPELLING_WHILE_TYPING:
-      return pref->GetBoolean(prefs::kEnableSpellCheck);
-
     case IDC_SPELLPANEL_TOGGLE:
     case IDC_SPELLCHECK_MENU:
       return true;
   }
 
   return false;
 }
 
 void SpellCheckerSubMenuObserver::ExecuteCommand(int command_id) {
   DCHECK(IsCommandIdSupported(command_id));
 
   // Check to see if one of the spell check language ids have been clicked.
+  Profile* profile = proxy_->GetProfile();
   if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
       command_id < IDC_SPELLCHECK_LANGUAGES_LAST) {
-    Profile* profile = proxy_->GetProfile();
     const size_t language = command_id - IDC_SPELLCHECK_LANGUAGES_FIRST;
     if (profile && language < languages_.size()) {
       StringPrefMember dictionary_language;
       dictionary_language.Init(prefs::kSpellCheckDictionary,
                                profile->GetPrefs(),
                                NULL);
       dictionary_language.SetValue(languages_[language]);
     }
     return;
   }
 
   content::RenderViewHost* rvh = proxy_->GetRenderViewHost();
   switch (command_id) {
     case IDC_CHECK_SPELLING_WHILE_TYPING:
+      profile->GetPrefs()->SetBoolean(

[jeremy, 2012/06/14 14:49:50]

Do you need to null-check profile here too?

[Hironori Bono, 2012/06/18 07:23:55]

Thanks for your comment. Same as above, I have added a DCHECK() at Line 149.

+          prefs::kEnableSpellCheck,
+          !profile->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck));
       rvh->Send(new SpellCheckMsg_ToggleSpellCheck(rvh->GetRoutingID()));
       break;
   }
 }