Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/cookie_info_view.cc

 // 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.
 
 #include "chrome/browser/views/cookie_info_view.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 49 matching lines @@
     const net::CookieMonster::CanonicalCookie& cookie) {
   name_value_field_->SetText(UTF8ToWide(cookie.Name()));
   content_value_field_->SetText(UTF8ToWide(cookie.Value()));
   domain_value_field_->SetText(UTF8ToWide(domain));
   path_value_field_->SetText(UTF8ToWide(cookie.Path()));
   created_value_field_->SetText(
       base::TimeFormatFriendlyDateAndTime(cookie.CreationDate()));
 
   std::wstring expire_text = cookie.DoesExpire() ?
       base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate()) :
-      l10n_util::GetString(IDS_COOKIES_COOKIE_EXPIRES_SESSION);
+      UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION));
 
   if (editable_expiration_date_) {
     expire_combo_values_.clear();
     if (cookie.DoesExpire())
       expire_combo_values_.push_back(expire_text);
-    expire_combo_values_.push_back(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_EXPIRES_SESSION));
+    expire_combo_values_.push_back(UTF16ToWide(
+        l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION)));
     expires_value_combobox_->ModelChanged();
     expires_value_combobox_->SetSelectedItem(0);
     expires_value_combobox_->SetEnabled(true);
     expires_value_combobox_->set_listener(this);
   } else {
     expires_value_field_->SetText(expire_text);
   }
 
   send_for_value_field_->SetText(cookie.IsSecure() ?
-      l10n_util::GetString(IDS_COOKIES_COOKIE_SENDFOR_SECURE) :
-      l10n_util::GetString(IDS_COOKIES_COOKIE_SENDFOR_ANY));
+      UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_SECURE)) :
+      UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_ANY)));
   EnableCookieDisplay(true);
   Layout();
 }
 
 void CookieInfoView::SetCookieString(const GURL& url,
                                      const std::string& cookie_line) {
   net::CookieMonster::ParsedCookie pc(cookie_line);
   net::CookieMonster::CanonicalCookie cookie(url, pc);
   SetCookie(pc.HasDomain() ? pc.Domain() : url.host(), cookie);
 }
 
 
 void CookieInfoView::ClearCookieDisplay() {
   std::wstring no_cookie_string =
-      l10n_util::GetString(IDS_COOKIES_COOKIE_NONESELECTED);
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_NONESELECTED));
   name_value_field_->SetText(no_cookie_string);
   content_value_field_->SetText(no_cookie_string);
   domain_value_field_->SetText(no_cookie_string);
   path_value_field_->SetText(no_cookie_string);
   send_for_value_field_->SetText(no_cookie_string);
   created_value_field_->SetText(no_cookie_string);
   if (expires_value_field_)
     expires_value_field_->SetText(no_cookie_string);
   EnableCookieDisplay(false);
 }
@@ skipping 63 matching lines @@
 void CookieInfoView::Init() {
   // Ensure we don't run this more than once and leak memory.
   DCHECK(!name_label_);
 
   SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW);
   views::Border* border = views::Border::CreateSolidBorder(
       kCookieInfoViewBorderSize, border_color);
   set_border(border);
 
   name_label_ = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_NAME_LABEL));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_NAME_LABEL)));
   name_value_field_ = new views::Textfield;
   content_label_ = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_CONTENT_LABEL));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_CONTENT_LABEL)));
   content_value_field_ = new views::Textfield;
   domain_label_ = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_DOMAIN_LABEL));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_DOMAIN_LABEL)));
   domain_value_field_ = new views::Textfield;
   path_label_ = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_PATH_LABEL));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_PATH_LABEL)));
   path_value_field_ = new views::Textfield;
   send_for_label_ = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_SENDFOR_LABEL));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_LABEL)));
   send_for_value_field_ = new views::Textfield;
   created_label_ = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_CREATED_LABEL));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_CREATED_LABEL)));
   created_value_field_ = new views::Textfield;
   expires_label_ = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_EXPIRES_LABEL));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_LABEL)));
   if (editable_expiration_date_)
     expires_value_combobox_ = new views::Combobox(this);
   else
     expires_value_field_ = new views::Textfield;
 
   using views::GridLayout;
   using views::ColumnSet;
 
   GridLayout* layout = new GridLayout(this);
   layout->SetInsets(kCookieInfoViewInsetSize,
@@ skipping 51 matching lines @@
   send_for_value_field_->SetBackgroundColor(text_area_background);
   created_value_field_->SetReadOnly(true);
   created_value_field_->RemoveBorder();
   created_value_field_->SetBackgroundColor(text_area_background);
   if (expires_value_field_) {
     expires_value_field_->SetReadOnly(true);
     expires_value_field_->RemoveBorder();
     expires_value_field_->SetBackgroundColor(text_area_background);
   }
 }