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

chrome/browser/spellchecker/spellcheck_service.h

Index: chrome/browser/spellchecker/spellcheck_service.h
diff --git a/chrome/browser/spellchecker/spellcheck_service.h b/chrome/browser/spellchecker/spellcheck_service.h
index c7229e8b468b03a55676e5ad7ab141c84c5f89cb..48cdd8c03cc0980cd902cd7c6ff2c88d6da02c07 100644
--- a/chrome/browser/spellchecker/spellcheck_service.h
+++ b/chrome/browser/spellchecker/spellcheck_service.h
@@ -23,6 +23,7 @@ class SpellCheckHostMetrics;
 
 namespace base {
 class WaitableEvent;
+class SupportsUserData;
 }
 
 namespace content {
@@ -63,20 +64,15 @@ class SpellcheckService : public KeyedService,
 
   base::WeakPtr<SpellcheckService> GetWeakPtr();
 
-  // This function computes a vector of strings which are to be displayed in
-  // the context menu over a text area for changing spell check languages. It
-  // returns the index of the current spell check language in the vector.
+#if !defined(OS_MACOSX)
+  // Computes |languages| to display in the context menu over a text area for
+  // changing spellcheck languages. Returns the number of languages that are
+  // enabled, which are always at the beginning of |languages|.
   // TODO(port): this should take a vector of base::string16, but the
   // implementation has some dependencies in l10n util that need porting first.
-  static int GetSpellCheckLanguages(content::BrowserContext* context,
-                                    std::vector<std::string>* languages);
-
-  // Computes a vector of strings which are to be displayed in the context
-  // menu from |accept_languages| and |dictionary_language|.
-  static void GetSpellCheckLanguagesFromAcceptLanguages(
-      const std::vector<std::string>& accept_languages,
-      const std::string& dictionary_language,
-      std::vector<std::string>* languages);
+  static size_t GetSpellCheckLanguages(base::SupportsUserData* context,
+                                       std::vector<std::string>* languages);
+#endif
 
   // Signals the event attached by AttachTestEvent() to report the specified
   // event to browser tests. This function is called by this class and its
@@ -150,7 +146,9 @@ class SpellcheckService : public KeyedService,
 
   // Reacts to a change in user preference on which language should be used for

[please use gerrit instead, 2015/06/23 00:43:06]

Move the comment inside of #if

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

Done.

   // spellchecking.
+#if !defined(OS_MACOSX)
   void OnSpellCheckDictionaryChanged();
+#endif
 
   // Notification handler for changes to prefs::kSpellCheckUseSpellingService.
   void OnUseSpellingServiceChanged();