Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/collected_cookies_win.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/collected_cookies_win.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 62 matching lines @@
                         ContentSetting setting,
                         const std::wstring& domain_name) {
     if (!is_visible) {
       SetVisible(false);
       return;
     }
 
     std::wstring label;
     switch (setting) {
       case CONTENT_SETTING_BLOCK:
-        label = l10n_util::GetStringF(
-            IDS_COLLECTED_COOKIES_BLOCK_RULE_CREATED, domain_name);
+        label = UTF16ToWide(l10n_util::GetStringFUTF16(
+            IDS_COLLECTED_COOKIES_BLOCK_RULE_CREATED,
+            WideToUTF16(domain_name)));
         break;
 
       case CONTENT_SETTING_ALLOW:
-        label = l10n_util::GetStringF(
-            IDS_COLLECTED_COOKIES_ALLOW_RULE_CREATED, domain_name);
+        label = UTF16ToWide(l10n_util::GetStringFUTF16(
+            IDS_COLLECTED_COOKIES_ALLOW_RULE_CREATED,
+            WideToUTF16(domain_name)));
         break;
 
       case CONTENT_SETTING_SESSION_ONLY:
-        label = l10n_util::GetStringF(
-            IDS_COLLECTED_COOKIES_SESSION_RULE_CREATED, domain_name);
+        label = UTF16ToWide(l10n_util::GetStringFUTF16(
+            IDS_COLLECTED_COOKIES_SESSION_RULE_CREATED,
+            WideToUTF16(domain_name)));
         break;
 
       default:
         NOTREACHED();
     }
     label_->SetText(label);
     content_->Layout();
     SetVisible(true);
   }
 
@@ skipping 74 matching lines @@
   blocked_cookies_tree_->SetModel(NULL);
 }
 
 void CollectedCookiesWin::Init() {
   TabSpecificContentSettings* content_settings =
       tab_contents_->GetTabSpecificContentSettings();
   HostContentSettingsMap* host_content_settings_map =
       tab_contents_->profile()->GetHostContentSettingsMap();
 
   // Allowed Cookie list.
-  allowed_label_ = new views::Label(
-      l10n_util::GetString(IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL));
+  allowed_label_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL)));
   allowed_cookies_tree_model_.reset(
       content_settings->GetAllowedCookiesTreeModel());
   allowed_cookies_tree_ = new views::TreeView();
   allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get());
   allowed_cookies_tree_->SetController(this);
   allowed_cookies_tree_->SetRootShown(false);
   allowed_cookies_tree_->SetEditable(false);
   allowed_cookies_tree_->set_lines_at_root(true);
   allowed_cookies_tree_->set_auto_expand_children(true);
 
   // Blocked Cookie list.
   blocked_label_ = new views::Label(
-      l10n_util::GetString(
+      UTF16ToWide(l10n_util::GetStringUTF16(
           host_content_settings_map->BlockThirdPartyCookies() ?
               IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED :
-              IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL));
+              IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL)));
   blocked_label_->SetMultiLine(true);
   blocked_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   blocked_cookies_tree_model_.reset(
       content_settings->GetBlockedCookiesTreeModel());
   blocked_cookies_tree_ = new views::TreeView();
   blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get());
   blocked_cookies_tree_->SetController(this);
   blocked_cookies_tree_->SetRootShown(false);
   blocked_cookies_tree_->SetEditable(false);
   blocked_cookies_tree_->set_lines_at_root(true);
@@ skipping 21 matching lines @@
   layout->AddView(allowed_label_);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(
       allowed_cookies_tree_, 1, 1, GridLayout::FILL, GridLayout::FILL,
       kTreeViewWidth, kTreeViewHeight);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_layout_id);
-  block_allowed_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_COLLECTED_COOKIES_BLOCK_BUTTON));
+  block_allowed_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_BLOCK_BUTTON)));
   layout->AddView(
       block_allowed_button_, 1, 1, GridLayout::LEADING, GridLayout::CENTER);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(
       new views::Separator(), 1, 1, GridLayout::FILL, GridLayout::FILL);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(blocked_label_, 1, 1, GridLayout::FILL, GridLayout::FILL);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(
       blocked_cookies_tree_, 1, 1, GridLayout::FILL, GridLayout::FILL,
       kTreeViewWidth, kTreeViewHeight);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, three_columns_layout_id);
-  allow_blocked_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_COLLECTED_COOKIES_ALLOW_BUTTON));
+  allow_blocked_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_ALLOW_BUTTON)));
   layout->AddView(allow_blocked_button_);
-  for_session_blocked_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON));
+  for_session_blocked_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON)));
   layout->AddView(for_session_blocked_button_);
 
   layout->StartRow(0, single_column_layout_id);
   infobar_ = new InfobarView();
   layout->AddView(infobar_, 1, 1, GridLayout::FILL, GridLayout::FILL);
 
   EnableControls();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ConstrainedDialogDelegate implementation.
 
 std::wstring CollectedCookiesWin::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_COLLECTED_COOKIES_DIALOG_TITLE);
+  return UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_DIALOG_TITLE));
 }
 
 int CollectedCookiesWin::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_CANCEL;
 }
 
 std::wstring CollectedCookiesWin::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
-  return l10n_util::GetString(IDS_CLOSE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLOSE));
 }
 
 void CollectedCookiesWin::DeleteDelegate() {
   delete this;
 }
 
 bool CollectedCookiesWin::Cancel() {
   return true;
 }
 
@@ skipping 75 matching lines @@
 // NotificationObserver implementation.
 
 void CollectedCookiesWin::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   DCHECK(type == NotificationType::COLLECTED_COOKIES_SHOWN);
   DCHECK_EQ(Source<TabSpecificContentSettings>(source).ptr(),
             tab_contents_->GetTabSpecificContentSettings());
   window_->CloseConstrainedWindow();
 }