diff options
Diffstat (limited to 'chrome/renderer')
10 files changed, 17 insertions, 15 deletions
diff --git a/chrome/renderer/pepper/ppb_pdf_impl.cc b/chrome/renderer/pepper/ppb_pdf_impl.cc index 4b77044..2a43fb8 100644 --- a/chrome/renderer/pepper/ppb_pdf_impl.cc +++ b/chrome/renderer/pepper/ppb_pdf_impl.cc @@ -243,8 +243,10 @@ void SearchString(PP_Instance instance, bool case_sensitive, PP_PrivateFindResult** results, int* count) { - const char16* string = reinterpret_cast<const char16*>(input_string); - const char16* term = reinterpret_cast<const char16*>(input_term); + const base::char16* string = + reinterpret_cast<const base::char16*>(input_string); + const base::char16* term = + reinterpret_cast<const base::char16*>(input_term); UErrorCode status = U_ZERO_ERROR; UStringSearch* searcher = usearch_open( diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc index d4cafe4..f56ce48 100644 --- a/chrome/renderer/searchbox/searchbox_extension.cc +++ b/chrome/renderer/searchbox/searchbox_extension.cc @@ -58,7 +58,7 @@ const char kRTLHtmlTextDirection[] = "rtl"; // Converts a V8 value to a string16. base::string16 V8ValueToUTF16(v8::Handle<v8::Value> v) { v8::String::Value s(v); - return base::string16(reinterpret_cast<const char16*>(*s), s.length()); + return base::string16(reinterpret_cast<const base::char16*>(*s), s.length()); } // Converts string16 to V8 String. diff --git a/chrome/renderer/spellchecker/custom_dictionary_engine_unittest.cc b/chrome/renderer/spellchecker/custom_dictionary_engine_unittest.cc index dc9d50e..2e9f61e 100644 --- a/chrome/renderer/spellchecker/custom_dictionary_engine_unittest.cc +++ b/chrome/renderer/spellchecker/custom_dictionary_engine_unittest.cc @@ -25,6 +25,6 @@ TEST(CustomDictionaryTest, Basic) { } TEST(CustomDictionaryTest, HandlesNullCharacters) { - char16 data[4] = {'a', 0, 'b', 'c'}; + base::char16 data[4] = {'a', 0, 'b', 'c'}; EXPECT_FALSE(CustomDictionaryEngine().SpellCheckWord(data, 1, 1)); } diff --git a/chrome/renderer/spellchecker/spellcheck.cc b/chrome/renderer/spellchecker/spellcheck.cc index b08dfee..51c0ba9 100644 --- a/chrome/renderer/spellchecker/spellcheck.cc +++ b/chrome/renderer/spellchecker/spellcheck.cc @@ -175,7 +175,7 @@ void SpellCheck::Init(base::PlatformFile file, } bool SpellCheck::SpellCheckWord( - const char16* in_word, + const base::char16* in_word, int in_word_len, int tag, int* misspelling_start, @@ -258,9 +258,9 @@ base::string16 SpellCheck::GetAutoCorrectionWord(const base::string16& word, if (InitializeIfNeeded()) return autocorrect_word; - char16 misspelled_word[ + base::char16 misspelled_word[ chrome::spellcheck_common::kMaxAutoCorrectWordSize + 1]; - const char16* word_char = word.c_str(); + const base::char16* word_char = word.c_str(); for (int i = 0; i <= chrome::spellcheck_common::kMaxAutoCorrectWordSize; ++i) { if (i >= word_length) @@ -354,7 +354,7 @@ void SpellCheck::CreateTextCheckingResults( // Double-check misspelled words with our spellchecker and attach grammar // markers to them if our spellchecker tells they are correct words, i.e. they // are probably contextually-misspelled words. - const char16* text = line_text.c_str(); + const base::char16* text = line_text.c_str(); std::vector<WebTextCheckingResult> list; for (size_t i = 0; i < spellcheck_results.size(); ++i) { SpellCheckResult::Decoration decoration = spellcheck_results[i].decoration; diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h index bfc6e71..95779c0 100644 --- a/chrome/renderer/spellchecker/spellcheck.h +++ b/chrome/renderer/spellchecker/spellcheck.h @@ -66,7 +66,7 @@ class SpellCheck : public content::RenderProcessObserver, // If the word is spelled correctly, the vector is empty. // If optional_suggestions is NULL, suggested words will not be looked up. // Note that Doing suggest lookups can be slow. - bool SpellCheckWord(const char16* in_word, + bool SpellCheckWord(const base::char16* in_word, int in_word_len, int tag, int* misspelling_start, diff --git a/chrome/renderer/spellchecker/spellcheck_language.cc b/chrome/renderer/spellchecker/spellcheck_language.cc index 662148c..e9d1015 100644 --- a/chrome/renderer/spellchecker/spellcheck_language.cc +++ b/chrome/renderer/spellchecker/spellcheck_language.cc @@ -33,7 +33,7 @@ bool SpellcheckLanguage::InitializeIfNeeded() { } bool SpellcheckLanguage::SpellCheckWord( - const char16* in_word, + const base::char16* in_word, int in_word_len, int tag, int* misspelling_start, diff --git a/chrome/renderer/spellchecker/spellcheck_language.h b/chrome/renderer/spellchecker/spellcheck_language.h index acd58f4..0cd2bba 100644 --- a/chrome/renderer/spellchecker/spellcheck_language.h +++ b/chrome/renderer/spellchecker/spellcheck_language.h @@ -34,7 +34,7 @@ class SpellcheckLanguage { // If the word is spelled correctly, the vector is empty. // If optional_suggestions is NULL, suggested words will not be looked up. // Note that doing suggest lookups can be slow. - bool SpellCheckWord(const char16* in_word, + bool SpellCheckWord(const base::char16* in_word, int in_word_len, int tag, int* misspelling_start, diff --git a/chrome/renderer/spellchecker/spellcheck_provider.cc b/chrome/renderer/spellchecker/spellcheck_provider.cc index 84e18b7..191a686 100644 --- a/chrome/renderer/spellchecker/spellcheck_provider.cc +++ b/chrome/renderer/spellchecker/spellcheck_provider.cc @@ -241,7 +241,7 @@ void SpellCheckProvider::OnRespondSpellingService( bool SpellCheckProvider::HasWordCharacters( const base::string16& text, int index) const { - const char16* data = text.data(); + const base::char16* data = text.data(); int length = text.length(); while (index < length) { uint32 code = 0; diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chrome/renderer/spellchecker/spellcheck_worditerator.cc index 9d0e555..1297c5a 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator.cc +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.cc @@ -339,7 +339,7 @@ bool SpellcheckWordIterator::IsInitialized() const { return !!iterator_; } -bool SpellcheckWordIterator::SetText(const char16* text, size_t length) { +bool SpellcheckWordIterator::SetText(const base::char16* text, size_t length) { DCHECK(!!iterator_); // Set the text to be split by this iterator. diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.h b/chrome/renderer/spellchecker/spellcheck_worditerator.h index 3a757b9..09d54a6 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator.h +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.h @@ -122,7 +122,7 @@ class SpellcheckWordIterator { // Set text to be iterated. (This text does not have to be NULL-terminated.) // This function also resets internal state so we can reuse this iterator // without calling Initialize(). - bool SetText(const char16* text, size_t length); + bool SetText(const base::char16* text, size_t length); // Retrieves a word (or a contraction), stores its copy to 'word_string', and // stores the position and the length for input word to 'word_start'. Since @@ -154,7 +154,7 @@ class SpellcheckWordIterator { base::string16* output_string) const; // The pointer to the input string from which we are extracting words. - const char16* text_; + const base::char16* text_; // The length of the original string. int length_; |