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"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/tab_contents/spelling_bubble_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #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),
-      check_spelling_while_typing_(false) {
+      submenu_model_(delegate) {
   DCHECK(proxy_);
 }
 
 SpellCheckerSubMenuObserver::~SpellCheckerSubMenuObserver() {
 }
 
 void SpellCheckerSubMenuObserver::InitMenu(
     const content::ContextMenuParams& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  check_spelling_while_typing_ = params.spellcheck_enabled;
-
   // Add an item that toggles the spelling panel.
   submenu_model_.AddCheckItem(
       IDC_SPELLPANEL_TOGGLE,
       l10n_util::GetStringUTF16(
           spellcheck_mac::SpellingPanelVisible() ?
               IDS_CONTENT_CONTEXT_HIDE_SPELLING_PANEL :
               IDS_CONTENT_CONTEXT_SHOW_SPELLING_PANEL));
   submenu_model_.AddSeparator();
 
   // Add a 'Check Spelling While Typing' item in the sub menu.
@@ skipping 24 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_;
+    return profile && profile->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck);

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

same comment about splitting this into an if and early return.

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

Thanks for your comment. I have removed this profile and added a DCHECK().

   }
 
   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(

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

null-check profile?

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

Thanks for your comment. I was too focused on synchronizing the check status and
forgot checking it. I have added a DCHECK(). Also, I have added a NULL check for
|rvh| because my browser tests returns NULL.

+          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;
   }
 }