Enables the user to select multiple languages for spellchecking (UI)

chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc

 // Copyright 2014 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/renderer_context_menu/spellchecker_submenu_observer.h"
 
+#include <algorithm>
+
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/spellcheck_common.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "extensions/browser/view_type_utils.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),
       language_group_(group),
-      language_selected_(0) {
+      selected_languages_(0) {
   DCHECK(proxy_);
 }
 
 SpellCheckerSubMenuObserver::~SpellCheckerSubMenuObserver() {
 }
 
 void SpellCheckerSubMenuObserver::InitMenu(
     const content::ContextMenuParams& params) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Add available spell-checker languages to the sub menu.
   content::BrowserContext* browser_context = proxy_->GetBrowserContext();
   DCHECK(browser_context);
-  language_selected_ =
+  selected_languages_ =
       SpellcheckService::GetSpellCheckLanguages(browser_context, &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) {
-    base::string16 display_name(
-        l10n_util::GetDisplayNameForLocale(languages_[i], app_locale, true));
-    submenu_model_.AddRadioItem(IDC_SPELLCHECK_LANGUAGES_FIRST + i,
-                                display_name,
-                                language_group_);
+
+  if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) {
+    for (size_t i = 0; i < languages_.size(); ++i) {
+      submenu_model_.AddCheckItem(

[groby-ooo-7-16, 2015/06/18 00:44:29]

Weird question: Where do we initialize which languages are enabled or not?

[Julius, 2015/06/24 21:17:57]

In SpellCheckService::GetSpellCheckLanguages we pull out the PrefMember for
kAcceptLanguages. Then in spellcheck_common GetDictionaryLanguagesPref we pick
out the languages from the kSpellCheckDictionary/kSpellCheckDictionaries pref.

+          IDC_SPELLCHECK_LANGUAGES_FIRST + i,
+          l10n_util::GetDisplayNameForLocale(languages_[i], app_locale, true));
+    }
+  } else {
+    for (size_t i = 0; i < languages_.size(); ++i) {
+      submenu_model_.AddRadioItem(
+          IDC_SPELLCHECK_LANGUAGES_FIRST + i,
+          l10n_util::GetDisplayNameForLocale(languages_[i], app_locale, true),
+          language_group_);
+    }
   }
 
   // Add an item that opens the 'fonts and languages options' page.
   submenu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   submenu_model_.AddItemWithStringId(
       IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
       IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
 
   // Add a 'Check spelling while typing' item in the sub menu.
   submenu_model_.AddCheckItem(
@@ skipping 41 matching lines @@
   }
 
   return false;
 }
 
 bool SpellCheckerSubMenuObserver::IsCommandIdChecked(int command_id) {
   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;
+    return selected_languages_ >
+           base::checked_cast<size_t>(command_id -

[groby-ooo-7-16, 2015/06/18 00:44:29]

Please don't - this adds a CHECK statement, which adds cost to Chrome's runtime
- without any need to do so.

The if-command above already guarantees that the value will be within an
acceptable range.

[Julius, 2015/06/24 21:17:57]

Reverted to static_cast<size_t>

+                                      IDC_SPELLCHECK_LANGUAGES_FIRST);
   }
 
   // Check box for 'Check Spelling while typing'.
   if (command_id == IDC_CHECK_SPELLING_WHILE_TYPING) {
     Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
     DCHECK(profile);
     return profile->GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck);
   }
 
   return false;
@@ skipping 19 matching lines @@
 
   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 = Profile::FromBrowserContext(proxy_->GetBrowserContext());
   DCHECK(profile);
+
   if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
       command_id < IDC_SPELLCHECK_LANGUAGES_LAST) {
-    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());
-      dictionary_language.SetValue(languages_[language]);
+    PrefService* prefs = profile->GetPrefs();
+    size_t language = command_id - IDC_SPELLCHECK_LANGUAGES_FIRST;
+    DCHECK_LT(language, languages_.size());
+
+    if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) {
+      std::vector<std::string> dictionary_languages =
+          chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs);
+
+      auto found_language =
+          std::find(dictionary_languages.begin(), dictionary_languages.end(),
+                    languages_[language]);
+
+      if (found_language != dictionary_languages.end())
+        dictionary_languages.erase(found_language);
+      else
+        dictionary_languages.push_back(languages_[language]);
+
+      prefs->SetString(
+          prefs::kSpellCheckDictionaries,
+          JoinString(dictionary_languages,
+                     chrome::spellcheck_common::kDictionaryLanguagesSeparator));
+    } else {
+      prefs->SetString(prefs::kSpellCheckDictionary, languages_[language]);
     }
     return;
   }
 
   switch (command_id) {
     case IDC_CHECK_SPELLING_WHILE_TYPING:
       profile->GetPrefs()->SetBoolean(
           prefs::kEnableContinuousSpellcheck,
           !profile->GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck));
     break;
   }
 }