Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/ui/views/content_setting_bubble_contents.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/views/content_setting_bubble_contents.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>
 #endif
 
-#include <algorithm>
-#include <string>
-#include <set>
-#include <vector>
-
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/bubble/bubble.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
@@ skipping 166 matching lines @@
   const int single_column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model_->bubble_content();
   bool bubble_content_empty = true;
 
   if (!bubble_content.title.empty()) {
-    views::Label* title_label = new views::Label(UTF8ToUTF16(
+    views::Label* title_label = new views::Label(UTF8ToWide(
         bubble_content.title));
     layout->StartRow(0, single_column_set_id);
     layout->AddView(title_label);
     bubble_content_empty = false;
   }
 
   const std::set<std::string>& plugins = bubble_content.resource_identifiers;
   if (!plugins.empty()) {
     if (!bubble_content_empty)
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
-      string16 name =
-          webkit::npapi::PluginList::Singleton()->GetPluginGroupName(*it);
+      std::wstring name = UTF16ToWide(
+          webkit::npapi::PluginList::Singleton()->GetPluginGroupName(*it));
       if (name.empty())
-        name = UTF8ToUTF16(*it);
+        name = UTF8ToWide(*it);
       layout->StartRow(0, single_column_set_id);
       layout->AddView(new views::Label(name));
       bubble_content_empty = false;
     }
   }
 
   if (content_setting_bubble_model_->content_type() ==
       CONTENT_SETTINGS_TYPE_POPUPS) {
     const int popup_column_set_id = 2;
     views::ColumnSet* popup_column_set =
         layout->AddColumnSet(popup_column_set_id);
     popup_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                                 GridLayout::USE_PREF, 0, 0);
     popup_column_set->AddPaddingColumn(
         0, views::kRelatedControlHorizontalSpacing);
     popup_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                                 GridLayout::USE_PREF, 0, 0);
 
     for (std::vector<ContentSettingBubbleModel::PopupItem>::const_iterator
          i(bubble_content.popup_items.begin());
          i != bubble_content.popup_items.end(); ++i) {
       if (!bubble_content_empty)
         layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, popup_column_set_id);
 
-      views::Link* link = new views::Link(UTF8ToUTF16(i->title));
+      views::Link* link = new views::Link(UTF8ToWide(i->title));
       link->set_listener(this);
       link->SetElideInMiddle(true);
       popup_links_[link] = i - bubble_content.popup_items.begin();
       layout->AddView(new Favicon((*i).bitmap, this, link));
       layout->AddView(link);
       bubble_content_empty = false;
     }
   }
 
   const ContentSettingBubbleModel::RadioGroup& radio_group =
@@ skipping 24 matching lines @@
   views::ColumnSet* indented_single_column_set =
       layout->AddColumnSet(indented_single_column_set_id);
   indented_single_column_set->AddPaddingColumn(
       0, views::kPanelHorizIndentation);
   indented_single_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
                                         1, GridLayout::USE_PREF, 0, 0);
   for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i =
        bubble_content.domain_lists.begin();
        i != bubble_content.domain_lists.end(); ++i) {
     layout->StartRow(0, single_column_set_id);
-    views::Label* section_title = new views::Label(UTF8ToUTF16(i->title));
+    views::Label* section_title = new views::Label(UTF8ToWide(i->title));
     section_title->SetMultiLine(true);
     section_title->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->AddView(section_title, 1, 1, GridLayout::FILL, GridLayout::LEADING);
     for (std::set<std::string>::const_iterator j = i->hosts.begin();
          j != i->hosts.end(); ++j) {
       layout->StartRow(0, indented_single_column_set_id);
-      layout->AddView(new views::Label(UTF8ToUTF16(*j), domain_font));
+      layout->AddView(new views::Label(UTF8ToWide(*j), domain_font));
     }
     bubble_content_empty = false;
   }
 
   if (!bubble_content.custom_link.empty()) {
-    custom_link_ = new views::Link(UTF8ToUTF16(bubble_content.custom_link));
+    custom_link_ = new views::Link(UTF8ToWide(bubble_content.custom_link));
     custom_link_->SetEnabled(bubble_content.custom_link_enabled);
     custom_link_->set_listener(this);
     if (!bubble_content_empty)
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     layout->StartRow(0, single_column_set_id);
     layout->AddView(custom_link_);
     bubble_content_empty = false;
   }
 
   if (!bubble_content_empty) {
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     layout->StartRow(0, single_column_set_id);
     layout->AddView(new views::Separator, 1, 1,
                     GridLayout::FILL, GridLayout::FILL);
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   const int double_column_set_id = 1;
   views::ColumnSet* double_column_set =
       layout->AddColumnSet(double_column_set_id);
   double_column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   double_column_set->AddPaddingColumn(
       0, views::kUnrelatedControlHorizontalSpacing);
   double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, double_column_set_id);
-  manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
+  manage_link_ = new views::Link(UTF8ToWide(bubble_content.manage_link));
   manage_link_->set_listener(this);
   layout->AddView(manage_link_);
 
   close_button_ =
       new views::NativeTextButton(this,
           UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE)));
   layout->AddView(close_button_);
 }