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

chrome/browser/ui/views/first_run_bubble.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/first_run_bubble.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 403 matching lines @@
 FirstRunMinimalBubbleView::FirstRunMinimalBubbleView(
     FirstRunBubble* bubble_window,
     Profile* profile)
     : bubble_window_(bubble_window),
       profile_(profile),
       label1_(NULL),
       label2_(NULL) {
   const gfx::Font& font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont);
 
-  label1_ = new views::Label(UTF16ToWide(l10n_util::GetStringFUTF16(
+  label1_ = new views::Label(l10n_util::GetStringFUTF16(
       IDS_FR_SE_BUBBLE_TITLE,
-      GetDefaultSearchEngineName(profile_))));
+      GetDefaultSearchEngineName(profile_)));
   label1_->SetFont(font.DeriveFont(3, gfx::Font::BOLD));
   label1_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(label1_);
 
   gfx::Size ps = GetPreferredSize();
 
   label2_ = new views::Label(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT)));
   label2_->SetMultiLine(true);
   label2_->SetFont(font);
@@ skipping 122 matching lines @@
   // Keep window from automatically closing until kLingerTime has passed.
   if (::IsWindowEnabled(GetParent()))
     Bubble::OnActivate(action, minimized, window);
 }
 
 void FirstRunBubble::BubbleClosing(Bubble* bubble, bool closed_by_escape) {
   // Make sure our parent window is re-enabled.
   if (!IsWindowEnabled(GetParent()))
     ::EnableWindow(GetParent(), true);
 }