Index: chrome/renderer/spellchecker/spellcheck_language.cc |
diff --git a/chrome/renderer/spellchecker/spellcheck_language.cc b/chrome/renderer/spellchecker/spellcheck_language.cc |
index d30820c3c1edb0efd20d9a75ead968e5b08d18cd..662148ce72ab134165941f661c02e4aebe7a1c9c 100644 |
--- a/chrome/renderer/spellchecker/spellcheck_language.cc |
+++ b/chrome/renderer/spellchecker/spellcheck_language.cc |
@@ -38,7 +38,7 @@ bool SpellcheckLanguage::SpellCheckWord( |
int tag, |
int* misspelling_start, |
int* misspelling_len, |
- std::vector<string16>* optional_suggestions) { |
+ std::vector<base::string16>* optional_suggestions) { |
DCHECK(in_word_len >= 0); |
DCHECK(misspelling_start && misspelling_len) << "Out vars must be given."; |
@@ -57,7 +57,7 @@ bool SpellcheckLanguage::SpellCheckWord( |
if (in_word_len == 0) |
return true; // No input means always spelled correctly. |
- string16 word; |
+ base::string16 word; |
int word_start; |
int word_length; |
if (!text_iterator_.IsInitialized() && |
@@ -98,7 +98,7 @@ bool SpellcheckLanguage::SpellCheckWord( |
// This function is a fall-back when the SpellcheckWordIterator class |
// returns a concatenated word which is not in the selected dictionary |
// (e.g. "in'n'out") but each word is valid. |
-bool SpellcheckLanguage::IsValidContraction(const string16& contraction, |
+bool SpellcheckLanguage::IsValidContraction(const base::string16& contraction, |
int tag) { |
if (!contraction_iterator_.IsInitialized() && |
!contraction_iterator_.Initialize(&character_attributes_, false)) { |
@@ -109,7 +109,7 @@ bool SpellcheckLanguage::IsValidContraction(const string16& contraction, |
contraction_iterator_.SetText(contraction.c_str(), contraction.length()); |
- string16 word; |
+ base::string16 word; |
int word_start; |
int word_length; |