Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/gtk/location_bar_view_gtk.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/ui/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 441 matching lines @@
   InstantController* instant = browser_->instant();
   if (instant)
     instant->OnAutocompleteLostFocus(view_gaining_focus);
 }
 
 void LocationBarViewGtk::OnAutocompleteWillAccept() {
   update_instant_ = false;
 }
 
 bool LocationBarViewGtk::OnCommitSuggestedText(
-    const string16& typed_text) {
+    const std::wstring& typed_text) {
   return browser_->instant() && location_entry_->CommitInstantSuggestion();
 }
 
 bool LocationBarViewGtk::AcceptCurrentInstantPreview() {
   return InstantController::CommitIfCurrent(browser_->instant());
 }
 
 void LocationBarViewGtk::OnPopupBoundsChanged(const gfx::Rect& bounds) {
   InstantController* instant = browser_->instant();
   if (instant)
@@ skipping 33 matching lines @@
 
   if (browser_->instant() && !location_entry_->model()->popup_model()->IsOpen())
     browser_->instant()->DestroyPreviewContents();
 
   update_instant_ = true;
 }
 
 void LocationBarViewGtk::OnChanged() {
   UpdateSiteTypeArea();
 
-  const string16 keyword(location_entry_->model()->keyword());
+  const std::wstring keyword(location_entry_->model()->keyword());
   const bool is_keyword_hint = location_entry_->model()->is_keyword_hint();
   show_selected_keyword_ = !keyword.empty() && !is_keyword_hint;
   show_keyword_hint_ = !keyword.empty() && is_keyword_hint;
 
   if (show_selected_keyword_)
     SetKeywordLabel(keyword);
 
   if (show_keyword_hint_)
     SetKeywordHintLabel(keyword);
 
   AdjustChildrenVisibility();
 
   InstantController* instant = browser_->instant();
   string16 suggested_text;
   if (update_instant_ && instant && GetTabContents()) {
     if (location_entry_->model()->user_input_in_progress() &&
         location_entry_->model()->popup_model()->IsOpen()) {
       instant->Update(
           browser_->GetSelectedTabContentsWrapper(),
           location_entry_->model()->CurrentMatch(),
-          location_entry_->GetText(),
+          WideToUTF16(location_entry_->GetText()),
           location_entry_->model()->UseVerbatimInstant(),
           &suggested_text);
       if (!instant->MightSupportInstant()) {
-        location_entry_->model()->FinalizeInstantQuery(string16(),
-                                                       string16());
+        location_entry_->model()->FinalizeInstantQuery(std::wstring(),
+                                                       std::wstring());
       }
     } else {
       instant->DestroyPreviewContents();
-      location_entry_->model()->FinalizeInstantQuery(string16(),
-                                                     string16());
+      location_entry_->model()->FinalizeInstantQuery(std::wstring(),
+                                                     std::wstring());
     }
   }
 
   SetSuggestedText(suggested_text);
 }
 
 void LocationBarViewGtk::OnSelectionBoundsChanged() {
   NOTIMPLEMENTED();
 }
 
@@ skipping 41 matching lines @@
       Details<AccessibilityTextBoxInfo>(&info));
 
   // Update the keyword and search hint states.
   OnChanged();
 }
 
 SkBitmap LocationBarViewGtk::GetFavIcon() const {
   return GetTabContents()->GetFavIcon();
 }
 
-string16 LocationBarViewGtk::GetTitle() const {
-  return GetTabContents()->GetTitle();
+std::wstring LocationBarViewGtk::GetTitle() const {
+  return UTF16ToWideHack(GetTabContents()->GetTitle());
 }
 
 void LocationBarViewGtk::ShowFirstRunBubble(FirstRun::BubbleType bubble_type) {
   // We need the browser window to be shown before we can show the bubble, but
   // we get called before that's happened.
   Task* task = first_run_bubble_.NewRunnableMethod(
       &LocationBarViewGtk::ShowFirstRunBubbleInternal, bubble_type);
   MessageLoop::current()->PostTask(FROM_HERE, task);
 }
 
 void LocationBarViewGtk::SetSuggestedText(const string16& text) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kInstantAutocompleteImmediately)) {
     // This method is internally invoked to reset suggest text, so we only do
     // anything if the text isn't empty.
     // TODO: if we keep autocomplete, make it so this isn't invoked with empty
     // text.
     if (!text.empty()) {
       location_entry_->model()->FinalizeInstantQuery(
-          location_entry_->GetText(), text);
+          location_entry_->GetText(),
+          UTF16ToWide(text));
     }
   } else {
     location_entry_->SetInstantSuggestion(text);
   }
 }
 
 std::wstring LocationBarViewGtk::GetInputString() const {
   return location_input_;
 }
 
@@ skipping 322 matching lines @@
   int max_chars = static_cast<int>(static_cast<float>(text_area) /
                                    static_cast<float>(char_width) / 2.75);
   // Don't let the label be smaller than 10 characters so that the country
   // code is always visible.
   gtk_label_set_max_width_chars(GTK_LABEL(security_info_label_),
                                 std::max(10, max_chars));
 
   pango_font_metrics_unref(metrics);
 }
 
-void LocationBarViewGtk::SetKeywordLabel(const string16& keyword) {
+void LocationBarViewGtk::SetKeywordLabel(const std::wstring& keyword) {
   if (keyword.empty())
     return;
 
   DCHECK(profile_);
   if (!profile_->GetTemplateURLModel())
     return;
 
   bool is_extension_keyword;
   const string16 short_name = profile_->GetTemplateURLModel()->
-      GetKeywordShortName(keyword, &is_extension_keyword);
+      GetKeywordShortName(WideToUTF16Hack(keyword), &is_extension_keyword);
   int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;
   string16 full_name = l10n_util::GetStringFUTF16(message_id,
                                                   short_name);
   string16 partial_name = l10n_util::GetStringFUTF16(
       message_id,
       WideToUTF16Hack(
           location_bar_util::CalculateMinString(UTF16ToWideHack(short_name))));
   gtk_label_set_text(GTK_LABEL(tab_to_search_full_label_),
                      UTF16ToUTF8(full_name).c_str());
   gtk_label_set_text(GTK_LABEL(tab_to_search_partial_label_),
                      UTF16ToUTF8(partial_name).c_str());
 
   if (last_keyword_ != keyword) {
     last_keyword_ = keyword;
 
     if (is_extension_keyword) {
       const TemplateURL* template_url =
-          profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword);
+          profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(
+              WideToUTF16Hack(keyword));
       const SkBitmap& bitmap = profile_->GetExtensionService()->
           GetOmniboxIcon(template_url->GetExtensionId());
       GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
       gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_), pixbuf);
       g_object_unref(pixbuf);
     } else {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_),
                                 rb.GetPixbufNamed(IDR_OMNIBOX_SEARCH));
     }
   }
 }
 
-void LocationBarViewGtk::SetKeywordHintLabel(const string16& keyword) {
+void LocationBarViewGtk::SetKeywordHintLabel(const std::wstring& keyword) {
   if (keyword.empty())
     return;
 
   DCHECK(profile_);
   if (!profile_->GetTemplateURLModel())
     return;
 
   bool is_extension_keyword;
   const string16 short_name = profile_->GetTemplateURLModel()->
-      GetKeywordShortName(keyword, &is_extension_keyword);
+      GetKeywordShortName(WideToUTF16Hack(keyword), &is_extension_keyword);
   int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_HINT : IDS_OMNIBOX_KEYWORD_HINT;
   std::vector<size_t> content_param_offsets;
   const string16 keyword_hint = l10n_util::GetStringFUTF16(
       message_id,
       string16(),
       short_name,
       &content_param_offsets);
   if (content_param_offsets.size() != 2) {
     // See comments on an identical NOTREACHED() in search_provider.cc.
@@ skipping 83 matching lines @@
   ui::WriteURLWithName(data, tab->GetURL(), tab->GetTitle(), info);
 }
 
 void LocationBarViewGtk::OnIconDragBegin(GtkWidget* sender,
                                          GdkDragContext* context) {
   SkBitmap favicon = GetFavIcon();
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&favicon);
   if (!pixbuf)
     return;
   drag_icon_ = bookmark_utils::GetDragRepresentation(pixbuf,
-      GetTitle(), theme_provider_);
+      WideToUTF16(GetTitle()), theme_provider_);
   g_object_unref(pixbuf);
   gtk_drag_set_icon_widget(context, drag_icon_, 0, 0);
 }
 
 void LocationBarViewGtk::OnIconDragEnd(GtkWidget* sender,
                                        GdkDragContext* context) {
   DCHECK(drag_icon_);
   gtk_widget_destroy(drag_icon_);
   drag_icon_ = NULL;
 }
@@ skipping 400 matching lines @@
 
   std::string badge_text = page_action_->GetBadgeText(tab_id);
   if (badge_text.empty())
     return FALSE;
 
   gfx::CanvasSkiaPaint canvas(event, false);
   gfx::Rect bounding_rect(widget->allocation);
   page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
   return FALSE;
 }