Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_edit_view_views.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/autocomplete/autocomplete_edit_view_views.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 270 matching lines @@
   views::TextRange selection;
   textfield_->GetSelectedRange(&selection);
   GetStateAccessor()->SetProperty(
       tab->property_bag(),
       AutocompleteEditState(model_state, ViewState(selection)));
 }
 
 void AutocompleteEditViewViews::Update(const TabContents* contents) {
   // NOTE: We're getting the URL text here from the ToolbarModel.
   bool visibly_changed_permanent_text =
-      model_->UpdatePermanentText(WideToUTF16Hack(toolbar_model_->GetText()));
+      model_->UpdatePermanentText(toolbar_model_->GetText());
 
   ToolbarModel::SecurityLevel security_level =
         toolbar_model_->GetSecurityLevel();
   bool changed_security_level = (security_level != security_level_);
   security_level_ = security_level;
 
   // TODO(oshima): Copied from gtk implementation which is
   // slightly different from WIN impl. Find out the correct implementation
   // for views-implementation.
   if (contents) {
@@ skipping 12 matching lines @@
   } else if (changed_security_level) {
     EmphasizeURLComponents();
   }
 }
 
 void AutocompleteEditViewViews::OpenURL(const GURL& url,
                                         WindowOpenDisposition disposition,
                                         PageTransition::Type transition,
                                         const GURL& alternate_nav_url,
                                         size_t selected_line,
-                                        const string16& keyword) {
+                                        const std::wstring& keyword) {
   if (!url.is_valid())
     return;
 
   model_->OpenURL(url, disposition, transition, alternate_nav_url,
                   selected_line, keyword);
 }
 
-string16 AutocompleteEditViewViews::GetText() const {
+std::wstring AutocompleteEditViewViews::GetText() const {
   // TODO(oshima): IME support
-  return textfield_->text();
+  return UTF16ToWide(textfield_->text());
 }
 
 bool AutocompleteEditViewViews::IsEditingOrEmpty() const {
   return model_->user_input_in_progress() || (GetTextLength() == 0);
 }
 
 int AutocompleteEditViewViews::GetIcon() const {
   return IsEditingOrEmpty() ?
       AutocompleteMatch::TypeToIcon(model_->CurrentTextType()) :
       toolbar_model_->GetIcon();
 }
 
-void AutocompleteEditViewViews::SetUserText(const string16& text) {
+void AutocompleteEditViewViews::SetUserText(const std::wstring& text) {
   SetUserText(text, text, true);
 }
 
-void AutocompleteEditViewViews::SetUserText(const string16& text,
-                                            const string16& display_text,
+void AutocompleteEditViewViews::SetUserText(const std::wstring& text,
+                                            const std::wstring& display_text,
                                             bool update_popup) {
   model_->SetUserText(text);
   SetWindowTextAndCaretPos(display_text, display_text.length());
   if (update_popup)
     UpdatePopup();
   TextChanged();
 }
 
 void AutocompleteEditViewViews::SetWindowTextAndCaretPos(
-    const string16& text,
+    const std::wstring& text,
     size_t caret_pos) {
   const views::TextRange range(caret_pos, caret_pos);
   SetTextAndSelectedRange(text, range);
 }
 
 void AutocompleteEditViewViews::SetForcedQuery() {
-  const string16 current_text(GetText());
-  const size_t start = current_text.find_first_not_of(kWhitespaceUTF16);
-  if (start == string16::npos || (current_text[start] != '?')) {
-    SetUserText(ASCIIToUTF16("?"));
+  const std::wstring current_text(GetText());
+  const size_t start = current_text.find_first_not_of(kWhitespaceWide);
+  if (start == std::wstring::npos || (current_text[start] != '?')) {
+    SetUserText(L"?");
   } else {
     SelectRange(current_text.size(), start + 1);
   }
 }
 
 bool AutocompleteEditViewViews::IsSelectAll() {
   // TODO(oshima): IME support.
   return textfield_->text() == textfield_->GetSelectedText();
 }
 
 bool AutocompleteEditViewViews::DeleteAtEndPressed() {
   return delete_at_end_pressed_;
 }
 
 void AutocompleteEditViewViews::GetSelectionBounds(
-    string16::size_type* start,
-    string16::size_type* end) {
+    std::wstring::size_type* start,
+    std::wstring::size_type* end) {
   views::TextRange range;
   textfield_->GetSelectedRange(&range);
   *start = static_cast<size_t>(range.end());
   *end = static_cast<size_t>(range.start());
 }
 
 void AutocompleteEditViewViews::SelectAll(bool reversed) {
   if (reversed)
     SelectRange(GetTextLength(), 0);
   else
@@ skipping 28 matching lines @@
   popup_view_->GetModel()->StopAutocomplete();
 }
 
 void AutocompleteEditViewViews::SetFocus() {
   // In views-implementation, the focus is on textfield rather than
   // AutocompleteEditView.
   textfield_->RequestFocus();
 }
 
 void AutocompleteEditViewViews::OnTemporaryTextMaybeChanged(
-    const string16& display_text,
+    const std::wstring& display_text,
     bool save_original_selection) {
   if (save_original_selection)
     textfield_->GetSelectedRange(&saved_temporary_selection_);
 
   SetWindowTextAndCaretPos(display_text, display_text.length());
   TextChanged();
 }
 
 bool AutocompleteEditViewViews::OnInlineAutocompleteTextMaybeChanged(
-    const string16& display_text,
+    const std::wstring& display_text,
     size_t user_text_length) {
   if (display_text == GetText())
     return false;
   views::TextRange range(display_text.size(), user_text_length);
   SetTextAndSelectedRange(display_text, range);
   TextChanged();
   return true;
 }
 
 void AutocompleteEditViewViews::OnRevertTemporaryText() {
@@ skipping 16 matching lines @@
     content_maybe_changed_by_key_press_ = true;
     return false;
   }
   views::TextRange new_sel;
   textfield_->GetSelectedRange(&new_sel);
 
   size_t length = GetTextLength();
   bool at_end_of_edit = (new_sel.start() == length && new_sel.end() == length);
 
   // See if the text or selection have changed since OnBeforePossibleChange().
-  string16 new_text = GetText();
+  std::wstring new_text = GetText();
   text_changed_ = (new_text != text_before_change_);
   bool selection_differs =
       !((sel_before_change_.is_empty() && new_sel.is_empty()) ||
         sel_before_change_.EqualsIgnoringDirection(new_sel));
 
   // When the user has deleted text, we don't allow inline autocomplete.  Make
   // sure to not flag cases like selecting part of the text and then pasting
   // (or typing) the prefix of that selection.  (We detect these by making
   // sure the caret, which should be after any insertion, hasn't moved
   // forward of the old selection start.)
@@ skipping 40 matching lines @@
 int AutocompleteEditViewViews::TextWidth() const {
   // TODO(oshima): add horizontal margin.
   return textfield_->font().GetStringWidth(textfield_->text());
 }
 
 bool AutocompleteEditViewViews::IsImeComposing() const {
   return false;
 }
 
 bool AutocompleteEditViewViews::CommitInstantSuggestion(
-    const string16& typed_text,
-    const string16& suggested_text) {
+    const std::wstring& typed_text,
+    const std::wstring& suggested_text) {
   model_->FinalizeInstantQuery(typed_text, suggested_text);
   return true;
 }
 
 void AutocompleteEditViewViews::SetInstantSuggestion(const string16& input) {
   NOTIMPLEMENTED();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditViewViews, NotificationObserver implementation:
@@ skipping 54 matching lines @@
   // TODO(oshima): Update URL visual style
   NOTIMPLEMENTED();
 }
 
 void AutocompleteEditViewViews::TextChanged() {
   EmphasizeURLComponents();
   controller_->OnChanged();
 }
 
 void AutocompleteEditViewViews::SetTextAndSelectedRange(
-    const string16& text,
+    const std::wstring& text,
     const views::TextRange& range) {
   if (text != GetText())
-    textfield_->SetText(text);
+    textfield_->SetText(WideToUTF16(text));
   textfield_->SelectRange(range);
 }
 
 string16 AutocompleteEditViewViews::GetSelectedText() const {
   // TODO(oshima): Support instant, IME.
   return textfield_->GetSelectedText();
 }
 
 void AutocompleteEditViewViews::SelectRange(size_t caret, size_t end) {
   const views::TextRange range(caret, end);
   textfield_->SelectRange(range);
 }