Change std::wstring to string16 for views::Label and views::Link

chrome/browser/ui/views/page_info_bubble_view.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/page_info_bubble_view.h"
 
+#include <algorithm>
+
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/bubble/bubble.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/cert_store.h"
 #include "grit/generated_resources.h"
@@ skipping 198 matching lines @@
       layout->StartRow(0, 0);
       layout->AddView(new views::Separator());
       layout->AddPaddingRow(0, kPaddingBelowSeparator);
     }
   }
 
   // Then add the help center link at the bottom.
   if (!only_internal_section) {
     layout->StartRow(0, 1);
     help_center_link_ = new views::Link(
-        UTF16ToWide(l10n_util::GetStringUTF16(IDS_PAGE_INFO_HELP_CENTER_LINK)));
+        l10n_util::GetStringUTF16(IDS_PAGE_INFO_HELP_CENTER_LINK));
     help_center_link_->set_listener(this);
     layout->AddView(help_center_link_);
   }
 
   layout->Layout(this);
 }
 
 gfx::Size PageInfoBubbleView::GetPreferredSize() {
   gfx::Size size(views::Widget::GetLocalizedContentsSize(
       IDS_PAGEINFOBUBBLE_WIDTH_CHARS, IDS_PAGEINFOBUBBLE_HEIGHT_LINES));
@@ skipping 119 matching lines @@
   headline_label_->SetReadOnly(true);
   headline_label_->RemoveBorder();
   headline_label_->SetTextColor(SK_ColorBLACK);
   headline_label_->SetBackgroundColor(SK_ColorWHITE);
   headline_label_->SetFont(
       headline_label_->font().DeriveFont(0, gfx::Font::BOLD));
   AddChildView(headline_label_);
 
   // Can't make this a text field to enable copying until multiline support is
   // added to text fields.
-  description_label_ = new views::Label(UTF16ToWideHack(info_.description));
+  description_label_ = new views::Label(info_.description);
   description_label_->set_background(
       views::Background::CreateSolidBackground(SK_ColorWHITE));
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   // Allow linebreaking in the middle of words if necessary, so that extremely
   // long hostnames (longer than one line) will still be completely shown.
   description_label_->SetAllowCharacterBreak(true);
   AddChildView(description_label_);
 
   if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY && show_cert) {
     link_ = new views::Link(
-        UTF16ToWide(l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON)));
+        l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON));
     link_->set_listener(this);
     AddChildView(link_);
   }
 }
 
 Section::~Section() {
 }
 
 void Section::SetAnimationStage(double animation_stage) {
   animation_value_ = animation_stage;
@@ skipping 107 matching lines @@
   // Show the bubble. If the bubble already exist - it will be closed first.
   PageInfoBubbleView* page_info_bubble =
       new PageInfoBubbleView(browser_view->GetNativeHandle(),
                              profile, url, ssl, show_history);
   Bubble* bubble =
       Bubble::Show(browser_view->GetWidget(), bounds,
                    views::BubbleBorder::TOP_LEFT,
                    page_info_bubble, page_info_bubble);
   page_info_bubble->set_bubble(bubble);
 }
-
 }