Implemented typo recognition in Chrome for Android.

chrome/renderer/spellchecker/spellcheck.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[please use gerrit instead, 2015/08/06 16:58:28]

Is this a bad merge? I don't think that you should be modifying this file.

[dylanking, 2015/08/07 03:33:54]

Agreed, sorry. Fixed.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
 #define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 33 matching lines @@
   enum ResultFilter {
     DO_NOT_MODIFY = 1,  // Do not modify results.
     USE_NATIVE_CHECKER,  // Use native checker to double-check.
   };
 
   SpellCheck();
   ~SpellCheck() override;
 
   void AddSpellcheckLanguage(base::File file, const std::string& language);
 
-  // If there are no dictionary files, then this requests them from the browser
+  // If there is no dictionary file, then this requests one from the browser
   // and does not block. In this case it returns true.
-  // If there are dictionary files, but their Hunspell has not been loaded, then
-  // this loads their Hunspell.
-  // If each dictionary file's Hunspell is already loaded, this does nothing. In
-  // both the latter cases it returns false, meaning that it is OK to continue
-  // spellchecking.
+  // If there is a dictionary file, but Hunspell has not been loaded, then
+  // this loads Hunspell.
+  // If Hunspell is already loaded, this does nothing. In both the latter cases
+  // it returns false, meaning that it is OK to continue spellchecking.
   bool InitializeIfNeeded();
 
   // SpellCheck a word.
   // Returns true if spelled correctly, false otherwise.
   // If the spellchecker failed to initialize, always returns true.
   // The |tag| parameter should either be a unique identifier for the document
   // that the word came from (if the current platform requires it), or 0.
   // In addition, finds the suggested words for a given word
   // and puts them into |*optional_suggestions|.
   // If the word is spelled correctly, the vector is empty.
@@ skipping 16 matching lines @@
   // Find a possible correctly spelled word for a misspelled word. Computes an
   // empty string if input misspelled word is too long, there is ambiguity, or
   // the correct spelling cannot be determined.
   // NOTE: If using the platform spellchecker, this will send a *lot* of sync
   // IPCs. We should probably refactor this if we ever plan to take it out from
   // behind its command line flag.
   base::string16 GetAutoCorrectionWord(const base::string16& word, int tag);
 
   // Requests to spellcheck the specified text in the background. This function
   // posts a background task and calls SpellCheckParagraph() in the task.
-#if !defined (USE_BROWSER_SPELLCHECKER)
+#if !defined (OS_MACOSX)
   void RequestTextChecking(const base::string16& text,
                            blink::WebTextCheckingCompletion* completion);
 #endif
 
   // Creates a list of WebTextCheckingResult objects (used by WebKit) from a
   // list of SpellCheckResult objects (used by Chrome). This function also
   // checks misspelled words returned by the Spelling service and changes the
   // underline colors of contextually-misspelled words.
   void CreateTextCheckingResults(
       ResultFilter filter,
@@ skipping 16 matching lines @@
   // Message handlers.
    void OnInit(const std::vector<SpellCheckBDictLanguage>& bdict_languages,
                const std::set<std::string>& custom_words,
                bool auto_spell_correct);
    void OnCustomDictionaryChanged(const std::set<std::string>& words_added,
                                   const std::set<std::string>& words_removed);
   void OnEnableAutoSpellCorrect(bool enable);
   void OnEnableSpellCheck(bool enable);
   void OnRequestDocumentMarkers();
 
-#if !defined (USE_BROWSER_SPELLCHECKER)
+#if !defined (OS_MACOSX)
   // Posts delayed spellcheck task and clear it if any.
   // Takes ownership of |request|.
   void PostDelayedSpellCheckTask(SpellcheckRequest* request);
 
   // Performs spell checking from the request queue.
   void PerformSpellCheck(SpellcheckRequest* request);
 
   // The parameters of a pending background-spellchecking request. When WebKit
   // sends a background-spellchecking request before initializing hunspell,
   // we save its parameters and start spellchecking after we finish initializing
@@ skipping 12 matching lines @@
   // Remember state for auto spell correct.
   bool auto_spell_correct_turned_on_;
 
   // Remember state for spellchecking.
   bool spellcheck_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellCheck);
 };
 
 #endif  // CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_