Fixing misleading name a in speech input setting and related variables.

chrome/browser/tab_contents/render_view_context_menu.cc

 // Copyright (c) 2011 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 <algorithm>
 #include <set>
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include "base/command_line.h"
@@ skipping 927 matching lines @@
 
   menu_model_.AddSubMenu(
       IDC_SPELLCHECK_MENU,
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLCHECK_MENU),
       &spellcheck_submenu_model_);
 }
 
 void RenderViewContextMenu::AppendSpeechInputOptionsSubMenu() {
   if (params_.speech_input_enabled) {
     speech_input_submenu_model_.AddCheckItem(
-        IDC_CONTENT_CONTEXT_SPEECH_INPUT_CENSOR_RESULTS,
+        IDC_CONTENT_CONTEXT_SPEECH_INPUT_FILTER_PROFANITIES,
         l10n_util::GetStringUTF16(
-            IDS_CONTENT_CONTEXT_SPEECH_INPUT_CENSOR_RESULTS));
+            IDS_CONTENT_CONTEXT_SPEECH_INPUT_FILTER_PROFANITIES));
 
     speech_input_submenu_model_.AddItemWithStringId(
         IDC_CONTENT_CONTEXT_SPEECH_INPUT_ABOUT,
         IDS_CONTENT_CONTEXT_SPEECH_INPUT_ABOUT);
 
     menu_model_.AddSubMenu(
         IDC_SPEECH_INPUT_MENU,
         l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPEECH_INPUT_MENU),
         &speech_input_submenu_model_);
   }
@@ skipping 343 matching lines @@
     case IDC_INPUT_METHODS_MENU:
       return true;
 #endif
 
     case IDC_CONTENT_CONTEXT_ADDSEARCHENGINE:
       return !params_.keyword_url.is_empty();
 
     case IDC_SPELLCHECK_MENU:
       return true;
 
-    case IDC_CONTENT_CONTEXT_SPEECH_INPUT_CENSOR_RESULTS:
+    case IDC_CONTENT_CONTEXT_SPEECH_INPUT_FILTER_PROFANITIES:
     case IDC_CONTENT_CONTEXT_SPEECH_INPUT_ABOUT:
     case IDC_SPEECH_INPUT_MENU:
       return true;
 
     case IDC_CONTENT_CONTEXT_OPENLINKWITH:
       return true;
 
     case IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_SETTINGS:
       return true;
 
@@ skipping 45 matching lines @@
       return false;
 #endif  // OS_MACOSX
 
   // Check box for 'Check the Spelling of this field'.
   if (id == IDC_CHECK_SPELLING_OF_THIS_FIELD) {
     return (params_.spellcheck_enabled &&
             profile_->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck));
   }
 
   // Check box for menu item 'Block offensive words'.
-  if (id == IDC_CONTENT_CONTEXT_SPEECH_INPUT_CENSOR_RESULTS) {
-    return profile_->GetPrefs()->GetBoolean(prefs::kSpeechInputCensorResults);
+  if (id == IDC_CONTENT_CONTEXT_SPEECH_INPUT_FILTER_PROFANITIES) {
+    return profile_->GetPrefs()->GetBoolean(
+        prefs::kSpeechInputFilterProfanities);
   }
 
   // Don't bother getting the display language vector if this isn't a spellcheck
   // language.
   if ((id < IDC_SPELLCHECK_LANGUAGES_FIRST) ||
       (id >= IDC_SPELLCHECK_LANGUAGES_LAST))
     return false;
 
   std::vector<std::string> languages;
   return SpellCheckHost::GetSpellCheckLanguages(profile_, &languages) ==
@@ skipping 433 matching lines @@
       if (tab_contents_wrapper &&
           tab_contents_wrapper->search_engine_tab_helper() &&
           tab_contents_wrapper->search_engine_tab_helper()->delegate()) {
         // Takes ownership of |template_url|.
         tab_contents_wrapper->search_engine_tab_helper()->delegate()->
             ConfirmAddSearchProvider(template_url.release(), profile_);
       }
       break;
     }
 
-    case IDC_CONTENT_CONTEXT_SPEECH_INPUT_CENSOR_RESULTS: {
+    case IDC_CONTENT_CONTEXT_SPEECH_INPUT_FILTER_PROFANITIES: {
       PrefService* prefs = profile_->GetPrefs();
-      const bool censor = !prefs->GetBoolean(prefs::kSpeechInputCensorResults);
-      prefs->SetBoolean(prefs::kSpeechInputCensorResults, censor);
-      profile_->GetSpeechInputPreferences()->set_censor_results(censor);
+      const bool filter = !prefs->GetBoolean(
+          prefs::kSpeechInputFilterProfanities);
+      prefs->SetBoolean(prefs::kSpeechInputFilterProfanities, filter);
+      profile_->GetSpeechInputPreferences()->set_filter_profanities(filter);
       break;
     }
 
     case IDC_CONTENT_CONTEXT_SPEECH_INPUT_ABOUT: {
       GURL url(chrome::kSpeechInputAboutURL);
       GURL localized_url = google_util::AppendGoogleLocaleParam(url);
       // Open URL with no referrer field (because user clicked on menu item).
       OpenURL(localized_url, GURL(), 0, NEW_FOREGROUND_TAB,
               PageTransition::LINK);
       break;
@@ skipping 97 matching lines @@
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
       g_browser_process->clipboard());
 }
 
 void RenderViewContextMenu::MediaPlayerActionAt(
     const gfx::Point& location,
     const WebMediaPlayerAction& action) {
   source_tab_contents_->render_view_host()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }