Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_edit_view.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file defines the interface class AutocompleteEditView.  Each toolkit
 // will implement the edit view differently, so that code is inherently
 // platform specific.  However, the AutocompleteEditModel needs to do some
 // communication with the view.  Since the model is shared between platforms,
 // we need to define an interface that all view implementations will share.
 
@@ skipping 42 matching lines @@
   // |selected_line| is passed to SendOpenNotification(); see comments there.
   //
   // If the URL was expanded from a keyword, |keyword| is that keyword.
   //
   // This may close the popup.
   virtual void OpenURL(const GURL& url,
                        WindowOpenDisposition disposition,
                        PageTransition::Type transition,
                        const GURL& alternate_nav_url,
                        size_t selected_line,
-                       const string16& keyword) = 0;
+                       const std::wstring& 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 string16 GetText() const = 0;
+  virtual std::wstring GetText() const = 0;
 
   // |true| if the user is in the process of editing the field, or if
   // the field is empty.
   virtual bool IsEditingOrEmpty() const = 0;
 
   // Returns the resource ID of the icon to show for the current text.
   virtual int GetIcon() const = 0;
 
   // 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 string16& text) = 0;
-  virtual void SetUserText(const string16& text,
-                           const string16& display_text,
+  virtual void SetUserText(const std::wstring& text) = 0;
+  virtual void SetUserText(const std::wstring& text,
+                           const std::wstring& display_text,
                            bool update_popup) = 0;
 
   // Sets the window text and the caret position.
-  virtual void SetWindowTextAndCaretPos(const string16& text,
+  virtual void SetWindowTextAndCaretPos(const std::wstring& text,
                                         size_t caret_pos) = 0;
 
   // Sets the edit to forced query mode.  Practically speaking, this means that
   // if the edit is not in forced query mode, its text is set to "?" with the
   // cursor at the end, and if the edit is in forced query mode (its first
   // non-whitespace character is '?'), the text after the '?' is selected.
   //
   // In the future we should display the search engine UI for the default engine
   // rather than '?'.
   virtual void SetForcedQuery() = 0;
 
   // Returns true if all text is selected or there is no text at all.
   virtual bool IsSelectAll() = 0;
 
   // Returns true if the user deleted the suggested text.
   virtual bool DeleteAtEndPressed() = 0;
 
   // Fills |start| and |end| with the indexes of the current selection's bounds.
   // 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(string16::size_type* start,
-                                  string16::size_type* end) = 0;
+  virtual void GetSelectionBounds(std::wstring::size_type* start,
+                                  std::wstring::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.
   virtual void SelectAll(bool reversed) = 0;
 
   // Reverts the edit and popup back to their unedited state (permanent text
   // showing, popup closed, no user input in progress).
   virtual void RevertAll() = 0;
 
   // Updates the autocomplete popup and other state after the text has been
   // changed by the user.
   virtual void UpdatePopup() = 0;
 
   // Closes the autocomplete popup, if it's open.
   virtual void ClosePopup() = 0;
 
   // Sets the focus to the autocomplete view.
   virtual void SetFocus() = 0;
 
   // Called when the temporary text in the model may have changed.
   // |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 string16& display_text,
+  virtual void OnTemporaryTextMaybeChanged(const std::wstring& display_text,
                                            bool save_original_selection) = 0;
 
   // Called when the inline autocomplete text in the model may have changed.
   // |display_text| is the new text to show; |user_text_length| is the length of
   // 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 string16& display_text, size_t user_text_length) = 0;
+      const std::wstring& 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.
   virtual void OnRevertTemporaryText() = 0;
 
   // Every piece of code that can change the edit should call these functions
   // before and after the change.  These functions determine if anything
   // meaningful changed, and do any necessary updating and notification.
   virtual void OnBeforePossibleChange() = 0;
   // OnAfterPossibleChange() returns true if there was a change that caused it
@@ skipping 15 matching lines @@
 
   // Returns true if the user is composing something in an IME.
   virtual bool IsImeComposing() const = 0;
 
 #if defined(TOOLKIT_VIEWS)
   // Adds the autocomplete edit view to view hierarchy and
   // returns the views::View of the edit view.
   virtual views::View* AddToView(views::View* parent) = 0;
 
   // Commits the suggested text.
-  virtual bool CommitInstantSuggestion(const string16& typed_text,
-                                       const string16& suggested_text) = 0;
+  virtual bool CommitInstantSuggestion(const std::wstring& typed_text,
+                                       const std::wstring& suggested_text) = 0;
 #endif
 
   virtual ~AutocompleteEditView() {}
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_H_