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

chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc

Index: chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc
diff --git a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc
index dafc01e9ee26bd73217c02f3dc87a8bbfc0996ec..6a8bb443d92ea2f6fa48eb9cce0e84e6cbcf93ee 100644
--- a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc
+++ b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc
@@ -4,10 +4,14 @@
 
 #include "chrome/browser/renderer_context_menu/spellchecker_submenu_observer.h"
 
+#include <algorithm>
+
 #include "base/command_line.h"
 #include "base/logging.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"
@@ -24,14 +28,17 @@
 
 using content::BrowserThread;
 
+namespace {
+static const char kLanguagesSeparator = ',';

[please use gerrit instead, 2015/02/24 23:38:38]

Let's use the constant from spellcheck_common here as well.

[Klemen Forstnerič, 2015/02/25 09:48:22]

Done.

+}  // namespace
+
 SpellCheckerSubMenuObserver::SpellCheckerSubMenuObserver(
     RenderViewContextMenuProxy* proxy,
     ui::SimpleMenuModel::Delegate* delegate,
     int group)
     : proxy_(proxy),
       submenu_model_(delegate),
-      language_group_(group),
-      language_selected_(0) {
+      language_group_(group) {
   DCHECK(proxy_);
 }
 
@@ -45,17 +52,24 @@ void SpellCheckerSubMenuObserver::InitMenu(
   // Add available spell-checker languages to the sub menu.
   content::BrowserContext* browser_context = proxy_->GetBrowserContext();
   DCHECK(browser_context);
-  language_selected_ =
+  spellcheck_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();
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
+
   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 (command_line->HasSwitch(switches::kEnableMultilingualSpellChecker)) {
+      submenu_model_.AddCheckItem(IDC_SPELLCHECK_LANGUAGES_FIRST + i,
+                                  display_name);
+    } else {
+      submenu_model_.AddRadioItem(

[please use gerrit instead, 2015/02/24 23:38:38]

Please format submenu_model_.AddCheckItem() and submenu_model_.AddRadioItem()
similarly for ease of reading. Unfortunately clang-format is not of much help.
You'll have to do this manually :-\.

[Klemen Forstnerič, 2015/02/25 09:48:23]

Done.

+          IDC_SPELLCHECK_LANGUAGES_FIRST + i, display_name, language_group_);
+    }
   }
 
   // Add an item that opens the 'fonts and languages options' page.
@@ -77,8 +91,6 @@ void SpellCheckerSubMenuObserver::InitMenu(
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE));
 
   // Add a check item "Automatically correct spelling".
-  const base::CommandLine* command_line =
-      base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableSpellingAutoCorrect)) {
     submenu_model_.AddCheckItem(IDC_CONTENT_CONTEXT_AUTOCORRECT_SPELLING_TOGGLE,
         l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_AUTOCORRECT));
@@ -117,7 +129,8 @@ bool SpellCheckerSubMenuObserver::IsCommandIdChecked(int 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 spellcheck_languages_.find(command_id -
+        IDC_SPELLCHECK_LANGUAGES_FIRST) != spellcheck_languages_.end();
   }
 
   // Check box for 'Check Spelling while typing'.
@@ -157,14 +170,35 @@ void SpellCheckerSubMenuObserver::ExecuteCommand(int command_id) {
   // Check to see if one of the spell check language ids have been clicked.
   Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
   DCHECK(profile);
+
+  PrefService* prefs = profile->GetPrefs();
   if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
       command_id < IDC_SPELLCHECK_LANGUAGES_LAST) {
     const size_t language = command_id - IDC_SPELLCHECK_LANGUAGES_FIRST;

[please use gerrit instead, 2015/02/24 23:38:38]

"const" is not necessary. We try to not go overboard on making everything that
does not change "const"..

[Klemen Forstnerič, 2015/02/25 09:48:22]

Done.

-    if (profile && language < languages_.size()) {
-      StringPrefMember dictionary_language;
-      dictionary_language.Init(prefs::kSpellCheckDictionary,
-                               profile->GetPrefs());
-      dictionary_language.SetValue(languages_[language]);
+
+    DCHECK_LT(language, languages_.size());
+
+    const base::CommandLine* command_line =
+        base::CommandLine::ForCurrentProcess();
+    if (command_line->HasSwitch(switches::kEnableMultilingualSpellChecker)) {

[please use gerrit instead, 2015/02/24 23:38:38]

Please inline "command_line", because it's used only once in this method.

[Klemen Forstnerič, 2015/02/25 09:48:23]

Done.

+      std::vector<std::string> languages_split;
+      base::SplitString(prefs->GetString(prefs::kSpellCheckDictionaries),
+                        kLanguagesSeparator,
+                        &languages_split);
+
+      auto found_language = std::find(languages_split.begin(),
+                                      languages_split.end(),
+                                      languages_[language]);
+
+      if (found_language != languages_split.end())
+        languages_split.erase(found_language);
+      else
+        languages_split.push_back(languages_[language]);
+
+      prefs->SetString(prefs::kSpellCheckDictionaries,
+                       JoinString(languages_split, kLanguagesSeparator));
+    } else {
+      prefs->SetString(prefs::kSpellCheckDictionary, languages_[language]);
     }
     return;
   }