Index: chrome/browser/autocomplete/autocomplete_edit_view.h |
=================================================================== |
--- chrome/browser/autocomplete/autocomplete_edit_view.h (revision 72388) |
+++ chrome/browser/autocomplete/autocomplete_edit_view.h (working copy) |
@@ -60,12 +60,12 @@ |
PageTransition::Type transition, |
const GURL& alternate_nav_url, |
size_t selected_line, |
- const std::wstring& keyword) = 0; |
+ const string16& keyword) = 0; |
// Returns the current text of the edit control, which could be the |
// "temporary" text set by the popup, the "permanent" text set by the |
// browser, or just whatever the user has currently typed. |
- virtual std::wstring GetText() const = 0; |
+ virtual string16 GetText() const = 0; |
// |true| if the user is in the process of editing the field, or if |
// the field is empty. |
@@ -77,13 +77,13 @@ |
// The user text is the text the user has manually keyed in. When present, |
// this is shown in preference to the permanent text; hitting escape will |
// revert to the permanent text. |
- virtual void SetUserText(const std::wstring& text) = 0; |
- virtual void SetUserText(const std::wstring& text, |
- const std::wstring& display_text, |
+ virtual void SetUserText(const string16& text) = 0; |
+ virtual void SetUserText(const string16& text, |
+ const string16& display_text, |
bool update_popup) = 0; |
// Sets the window text and the caret position. |
- virtual void SetWindowTextAndCaretPos(const std::wstring& text, |
+ virtual void SetWindowTextAndCaretPos(const string16& text, |
size_t caret_pos) = 0; |
// Sets the edit to forced query mode. Practically speaking, this means that |
@@ -105,8 +105,8 @@ |
// It is not guaranteed that |*start < *end|, as the selection can be |
// directed. If there is no selection, |start| and |end| will both be equal |
// to the current cursor position. |
- virtual void GetSelectionBounds(std::wstring::size_type* start, |
- std::wstring::size_type* end) = 0; |
+ virtual void GetSelectionBounds(string16::size_type* start, |
+ string16::size_type* end) = 0; |
// Selects all the text in the edit. Use this in place of SetSelAll() to |
// avoid selecting the "phantom newline" at the end of the edit. |
@@ -130,7 +130,7 @@ |
// |display_text| is the new text to show; |save_original_selection| is true |
// when there wasn't previously a temporary text and thus we need to save off |
// the user's existing selection. |
- virtual void OnTemporaryTextMaybeChanged(const std::wstring& display_text, |
+ virtual void OnTemporaryTextMaybeChanged(const string16& display_text, |
bool save_original_selection) = 0; |
// Called when the inline autocomplete text in the model may have changed. |
@@ -138,7 +138,7 @@ |
// the user input portion of that (so, up to but not including the inline |
// autocompletion). Returns whether the display text actually changed. |
virtual bool OnInlineAutocompleteTextMaybeChanged( |
- const std::wstring& display_text, size_t user_text_length) = 0; |
+ const string16& display_text, size_t user_text_length) = 0; |
// Called when the temporary text has been reverted by the user. This will |
// reset the user's original selection. |
@@ -174,8 +174,8 @@ |
virtual views::View* AddToView(views::View* parent) = 0; |
// Commits the suggested text. |
- virtual bool CommitInstantSuggestion(const std::wstring& typed_text, |
- const std::wstring& suggested_text) = 0; |
+ virtual bool CommitInstantSuggestion(const string16& typed_text, |
+ const string16& suggested_text) = 0; |
#endif |
virtual ~AutocompleteEditView() {} |