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

chrome/browser/ui/views/extensions/extension_uninstall_dialog_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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 131 matching lines @@
     : dialog_(dialog_view) {
   // Scale down to icon size, but allow smaller icons (don't scale up).
   gfx::Size size(icon->width(), icon->height());
   if (size.width() > kIconSize || size.height() > kIconSize)
     size = gfx::Size(kIconSize, kIconSize);
   icon_ = new views::ImageView();
   icon_->SetImageSize(size);
   icon_->SetImage(*icon);
   AddChildView(icon_);
 
-  heading_ = new views::Label(
+  heading_ = new views::Label(UTF16ToWide(
       l10n_util::GetStringFUTF16(IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,
-                                 UTF8ToUTF16(extension->name())));
+                                 UTF8ToUTF16(extension->name()))));
   heading_->SetMultiLine(true);
   AddChildView(heading_);
 }
 
 ExtensionUninstallDialogDelegateView::~ExtensionUninstallDialogDelegateView() {
 }
 
 std::wstring ExtensionUninstallDialogDelegateView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   switch (button) {
@@ skipping 63 matching lines @@
   }
 }
 
 }  // namespace
 
 // static
 ExtensionUninstallDialog* ExtensionUninstallDialog::Create(
     Profile* profile, Delegate* delegate) {
   return new ExtensionUninstallDialogViews(profile, delegate);
 }