Chromium Code Reviews| Index: chrome/renderer/spellchecker/spellcheck.cc |
| diff --git a/chrome/renderer/spellchecker/spellcheck.cc b/chrome/renderer/spellchecker/spellcheck.cc |
| index f27f31e38570bba0a11bac83bdf586d7e407e643..5bfcf28648df5a415b7ae54b155cd0b42e965759 100644 |
| --- a/chrome/renderer/spellchecker/spellcheck.cc |
| +++ b/chrome/renderer/spellchecker/spellcheck.cc |
| @@ -198,7 +198,7 @@ void SpellCheck::OnInit( |
| custom_dictionary_.Init(custom_words); |
| auto_spell_correct_turned_on_ = auto_spell_correct; |
| -#if !defined(OS_MACOSX) |
| +#if !defined(USE_BROWSER_SPELLCHECKER) |
| PostDelayedSpellCheckTask(pending_request_param_.release()); |
| #endif |
| } |
| @@ -261,8 +261,8 @@ bool SpellCheck::SpellCheckWord( |
| bool SpellCheck::SpellCheckParagraph( |
| const base::string16& text, |
| WebVector<WebTextCheckingResult>* results) { |
| -#if !defined(OS_MACOSX) |
| - // Mac has its own spell checker, so this method will not be used. |
| +#if !defined(USE_BROWSER_SPELLCHECKER) |
| + // Mac and Android have their own spell checkers,so this method won't be used |
| DCHECK(results); |
| std::vector<WebTextCheckingResult> textcheck_results; |
| size_t length = text.length(); |
| @@ -301,7 +301,7 @@ bool SpellCheck::SpellCheckParagraph( |
| return false; |
| #else |
| // This function is only invoked for spell checker functionality that runs |
| - // on the render thread. OSX builds don't have that. |
| + // on the render thread. OSX and Android builds don't have that. |
| NOTREACHED(); |
| return true; |
| #endif |
| @@ -360,7 +360,7 @@ base::string16 SpellCheck::GetAutoCorrectionWord(const base::string16& word, |
| return autocorrect_word; |
| } |
| -#if !defined(OS_MACOSX) // OSX uses its own spell checker |
| +#if !defined(USE_BROWSER_SPELLCHECKER) // OSX and Android use their own spell checkers |
|
groby-ooo-7-16
2015/08/04 18:41:35
Line length
dylanking
2015/08/04 18:49:10
Done. Thanks!
|
| void SpellCheck::RequestTextChecking( |
| const base::string16& text, |
| blink::WebTextCheckingCompletion* completion) { |
| @@ -382,7 +382,7 @@ bool SpellCheck::InitializeIfNeeded() { |
| return languages_.empty() ? true : languages_.front()->InitializeIfNeeded(); |
| } |
| -#if !defined(OS_MACOSX) // OSX doesn't have |pending_request_param_| |
| +#if !defined(USE_BROWSER_SPELLCHECKER) // OSX and Android don't have |pending_request_param_| |
|
groby-ooo-7-16
2015/08/04 18:41:35
Ditto
dylanking
2015/08/04 18:49:10
Done. Thanks!
|
| void SpellCheck::PostDelayedSpellCheckTask(SpellcheckRequest* request) { |
| if (!request) |
| return; |
| @@ -393,7 +393,7 @@ void SpellCheck::PostDelayedSpellCheckTask(SpellcheckRequest* request) { |
| } |
| #endif |
| -#if !defined(OS_MACOSX) // Mac uses its platform engine instead. |
| +#if !defined(USE_BROWSER_SPELLCHECKER) // Mac and Android use their platform engines instead. |
|
groby-ooo-7-16
2015/08/04 18:41:34
Ditto.
dylanking
2015/08/04 18:49:10
Done. Thanks!
|
| void SpellCheck::PerformSpellCheck(SpellcheckRequest* param) { |
| DCHECK(param); |