Index: ui/views/controls/prefix_selector.cc |
diff --git a/ui/views/controls/prefix_selector.cc b/ui/views/controls/prefix_selector.cc |
index d66a0346c8475dae2ae321b68787bc2534ae1e12..538972fa645086b53fb4415810ba91cef79a1824 100644 |
--- a/ui/views/controls/prefix_selector.cc |
+++ b/ui/views/controls/prefix_selector.cc |
@@ -47,12 +47,12 @@ void PrefixSelector::ConfirmCompositionText() { |
void PrefixSelector::ClearCompositionText() { |
} |
-void PrefixSelector::InsertText(const string16& text) { |
+void PrefixSelector::InsertText(const base::string16& text) { |
OnTextInput(text); |
} |
void PrefixSelector::InsertChar(char16 ch, int flags) { |
- OnTextInput(string16(1, ch)); |
+ OnTextInput(base::string16(1, ch)); |
} |
gfx::NativeWindow PrefixSelector::GetAttachedWindow() const { |
@@ -115,7 +115,7 @@ bool PrefixSelector::DeleteRange(const gfx::Range& range) { |
} |
bool PrefixSelector::GetTextFromRange(const gfx::Range& range, |
- string16* text) const { |
+ base::string16* text) const { |
return false; |
} |
@@ -143,7 +143,7 @@ void PrefixSelector::OnCandidateWindowUpdated() { |
void PrefixSelector::OnCandidateWindowHidden() { |
} |
-void PrefixSelector::OnTextInput(const string16& text) { |
+void PrefixSelector::OnTextInput(const base::string16& text) { |
// Small hack to filter out 'tab' and 'enter' input, as the expectation is |
// that they are control characters and will not affect the currently-active |
// prefix. |
@@ -171,7 +171,7 @@ void PrefixSelector::OnTextInput(const string16& text) { |
time_of_last_key_ = now; |
const int start_row = row; |
- const string16 lower_text(base::i18n::ToLower(current_text_)); |
+ const base::string16 lower_text(base::i18n::ToLower(current_text_)); |
do { |
if (TextAtRowMatchesText(row, current_text_)) { |
prefix_delegate_->SetSelectedRow(row); |
@@ -182,8 +182,8 @@ void PrefixSelector::OnTextInput(const string16& text) { |
} |
bool PrefixSelector::TextAtRowMatchesText(int row, |
- const string16& lower_text) { |
- const string16 model_text( |
+ const base::string16& lower_text) { |
+ const base::string16 model_text( |
base::i18n::ToLower(prefix_delegate_->GetTextForRow(row))); |
return (model_text.size() >= lower_text.size()) && |
(model_text.compare(0, lower_text.size(), lower_text) == 0); |