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

chrome/browser/ui/views/instant_confirm_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/instant_confirm_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 #include "views/widget/widget.h"
 
 InstantConfirmView::InstantConfirmView(Profile* profile) : profile_(profile) {
   views::Label* description_label = new views::Label(
-      l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE)));
   description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   description_label->SetMultiLine(true);
 
   views::Link* learn_more_link = new views::Link(
-      l10n_util::GetStringUTF16(IDS_LEARN_MORE));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)));
   learn_more_link->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   learn_more_link->set_listener(this);
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   const int first_column_set = 1;
   views::ColumnSet* column_set = layout->AddColumnSet(first_column_set);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING, 1,
                         views::GridLayout::USE_PREF, 0, 0);
@@ skipping 44 matching lines @@
 }
 
 namespace browser {
 
 void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) {
   views::Widget::CreateWindowWithParent(new InstantConfirmView(profile),
                                         parent)->Show();
 }
 
 }  // namespace browser