Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm

Index: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
===================================================================
--- chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm	(revision 72383)
+++ chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm	(working copy)
@@ -46,23 +46,23 @@
   return GetWidthForImageAndLabel(nil, partial_string_);
 }
 
-void SelectedKeywordDecoration::SetKeyword(const string16& short_name,
+void SelectedKeywordDecoration::SetKeyword(const std::wstring& short_name,
                                            bool is_extension_keyword) {
-  const string16 min_name(WideToUTF16Hack(
-      location_bar_util::CalculateMinString(UTF16ToWideHack(short_name))));
+  const std::wstring min_name(
+      location_bar_util::CalculateMinString(short_name));
   const int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;
 
   // The text will be like "Search <name>:".  "<name>" is a parameter
   // derived from |short_name|.
   full_string_.reset(
-      [l10n_util::GetNSStringF(message_id, short_name) copy]);
+      [l10n_util::GetNSStringF(message_id, WideToUTF16(short_name)) copy]);
 
   if (min_name.empty()) {
     partial_string_.reset();
   } else {
     partial_string_.reset(
-        [l10n_util::GetNSStringF(message_id, min_name) copy]);
+        [l10n_util::GetNSStringF(message_id, WideToUTF16(min_name)) copy]);
   }
 }
 
Property changes on: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
___________________________________________________________________
Added: svn:mergeinfo