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

chrome/browser/spellchecker/spellcheck_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_SERVICE_H_
 #define CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_SERVICE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/spellchecker/spellcheck_custom_dictionary.h"
 #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class SpellCheckHostMetrics;
 
 namespace base {
 class WaitableEvent;
+class SupportsUserData;
 }
 
 namespace content {
 class RenderProcessHost;
 class BrowserContext;
 class NotificationDetails;
 class NotificationSource;
 }
 
 namespace spellcheck {
@@ skipping 20 matching lines @@
     DICT_HUNSPELL,
     DICT_TEXT,
     DICT_UNKNOWN,
   };
 
   explicit SpellcheckService(content::BrowserContext* context);
   ~SpellcheckService() override;
 
   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
   // derived classes to report their status. This function does not do anything
   // when we do not set an event to |status_event_|.
   static bool SignalStatusEvent(EventType type);
 
   // Instantiates SpellCheckHostMetrics object and makes it ready for recording
   // metrics. This should be called only if the metrics recording is active.
   void StartRecordingMetrics(bool spellcheck_enabled);
@@ skipping 51 matching lines @@
   // Returns the status event type.
   static EventType GetStatusEvent();
 
   // Pass all renderers some basic initialization information.
   void InitForAllRenderers();
 
   // Reacts to a change in user preferences on whether auto-spell-correct should
   // be enabled.
   void OnEnableAutoSpellCorrectChanged();
 
   // 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();
 
   // Enables the feedback sender if spelling server is available and enabled.
   // Otherwise disables the feedback sender.
   void UpdateFeedbackSenderState();
 
   PrefChangeRegistrar pref_change_registrar_;
   content::NotificationRegistrar registrar_;
 
   // A pointer to the BrowserContext which this service refers to.
   content::BrowserContext* context_;
 
   scoped_ptr<SpellCheckHostMetrics> metrics_;
 
   scoped_ptr<SpellcheckCustomDictionary> custom_dictionary_;
 
   scoped_ptr<SpellcheckHunspellDictionary> hunspell_dictionary_;
 
   scoped_ptr<spellcheck::FeedbackSender> feedback_sender_;
 
   base::WeakPtrFactory<SpellcheckService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellcheckService);
 };
 
 #endif  // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_SERVICE_H_