Index: chrome/browser/autocomplete/autocomplete_edit_view_win.h |
=================================================================== |
--- chrome/browser/autocomplete/autocomplete_edit_view_win.h (revision 72388) |
+++ chrome/browser/autocomplete/autocomplete_edit_view_win.h (working copy) |
@@ -95,27 +95,27 @@ |
PageTransition::Type transition, |
const GURL& alternate_nav_url, |
size_t selected_line, |
- const std::wstring& keyword); |
+ const string16& keyword); |
- virtual std::wstring GetText() const; |
+ virtual string16 GetText() const; |
virtual bool IsEditingOrEmpty() const; |
virtual int GetIcon() const; |
- virtual void SetUserText(const std::wstring& text); |
- virtual void SetUserText(const std::wstring& text, |
- const std::wstring& display_text, |
+ virtual void SetUserText(const string16& text); |
+ virtual void SetUserText(const string16& text, |
+ const string16& display_text, |
bool update_popup); |
- virtual void SetWindowTextAndCaretPos(const std::wstring& text, |
+ virtual void SetWindowTextAndCaretPos(const string16& text, |
size_t caret_pos); |
virtual void SetForcedQuery(); |
virtual bool IsSelectAll(); |
virtual bool DeleteAtEndPressed(); |
- virtual void GetSelectionBounds(std::wstring::size_type* start, |
- std::wstring::size_type* end); |
+ virtual void GetSelectionBounds(string16::size_type* start, |
+ string16::size_type* end); |
virtual void SelectAll(bool reversed); |
virtual void RevertAll(); |
@@ -124,10 +124,10 @@ |
virtual void SetFocus(); |
- virtual void OnTemporaryTextMaybeChanged(const std::wstring& display_text, |
+ virtual void OnTemporaryTextMaybeChanged(const string16& display_text, |
bool save_original_selection); |
virtual bool OnInlineAutocompleteTextMaybeChanged( |
- const std::wstring& display_text, size_t user_text_length); |
+ const string16& display_text, size_t user_text_length); |
virtual void OnRevertTemporaryText(); |
virtual void OnBeforePossibleChange(); |
virtual bool OnAfterPossibleChange(); |
@@ -138,8 +138,8 @@ |
virtual bool IsImeComposing() const; |
virtual views::View* AddToView(views::View* parent); |
- virtual bool CommitInstantSuggestion(const std::wstring& typed_text, |
- const std::wstring& suggested_text); |
+ virtual bool CommitInstantSuggestion(const string16& typed_text, |
+ const string16& suggested_text); |
int GetPopupMaxYCoordinate(); |
@@ -156,12 +156,12 @@ |
void MoveSelectedText(int new_position); |
// Inserts the text at the specified position. |
- void InsertText(int position, const std::wstring& text); |
+ void InsertText(int position, const string16& text); |
// Invokes CanPasteAndGo with the specified text, and if successful navigates |
// to the appropriate URL. The behavior of this is the same as if the user |
// typed in the specified text and pressed enter. |
- void PasteAndGo(const std::wstring& text); |
+ void PasteAndGo(const string16& text); |
void set_force_hidden(bool force_hidden) { force_hidden_ = force_hidden; } |
@@ -213,7 +213,7 @@ |
virtual bool GetAcceleratorForCommandId(int command_id, |
ui::Accelerator* accelerator); |
virtual bool IsItemForCommandIdDynamic(int command_id) const; |
- virtual std::wstring GetLabelForCommandId(int command_id) const; |
+ virtual string16 GetLabelForCommandId(int command_id) const; |
virtual void ExecuteCommand(int command_id); |
private: |
@@ -312,7 +312,7 @@ |
void GetSelection(CHARRANGE& sel) const; |
// Returns the currently selected text of the edit control. |
- std::wstring GetSelectedText() const; |
+ string16 GetSelectedText() const; |
// Like SetSel(), but respects the selection direction implied by |start| and |
// |end|: if |end| < |start|, the effective cursor will be placed at the |
@@ -370,10 +370,10 @@ |
// Returns the current clipboard contents as a string that can be pasted in. |
// In addition to just getting CF_UNICODETEXT out, this can also extract URLs |
// from bookmarks on the clipboard. |
- std::wstring GetClipboardText() const; |
+ string16 GetClipboardText() const; |
// Determines whether the user can "paste and go", given the specified text. |
- bool CanPasteAndGo(const std::wstring& text) const; |
+ bool CanPasteAndGo(const string16& text) const; |
// Getter for the text_object_model_. Note that the pointer returned here is |
// only valid as long as the AutocompleteEdit is still alive. Also, if the |
@@ -403,7 +403,7 @@ |
int GetHorizontalMargin() const; |
// Returns the width in pixels needed to display |text|. |
- int WidthNeededToDisplay(const std::wstring& text) const; |
+ int WidthNeededToDisplay(const string16& text) const; |
// Real implementation of OnAfterPossibleChange() method. |
// If |force_text_changed| is true, then the text_changed code will always be |
@@ -472,7 +472,7 @@ |
bool ignore_ime_messages_; |
// Variables for tracking state before and after a possible change. |
- std::wstring text_before_change_; |
+ string16 text_before_change_; |
CHARRANGE sel_before_change_; |
// Set at the same time the model's original_* members are set, and valid in |