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

chrome/browser/ui/views/extensions/extension_install_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_install_dialog.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 144 matching lines @@
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
   column_set->AddColumn(GridLayout::LEADING,
                         GridLayout::LEADING,
                         0,  // no resizing
                         GridLayout::USE_PREF,
                         0,  // no fixed width
                         kIconSize);
 
   layout->StartRow(0, column_set_id);
 
-  views::Label* heading = new views::Label(
-      prompt.GetHeading(extension->name()));
+  views::Label* heading = new views::Label(UTF16ToWide(
+      prompt.GetHeading(extension->name())));
   heading->SetFont(heading->font().DeriveFont(kHeadingFontSizeDelta,
                                               gfx::Font::BOLD));
   heading->SetMultiLine(true);
   heading->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   heading->SizeToFit(left_column_width);
   layout->AddView(heading);
 
   // Scale down to icon size, but allow smaller icons (don't scale up).
   gfx::Size size(skia_icon->width(), skia_icon->height());
   if (size.width() > kIconSize || size.height() > kIconSize)
@@ skipping 15 matching lines @@
   layout->AddView(icon, 1, icon_row_span);
 
   if (is_inline_install()) {
     layout->StartRow(0, column_set_id);
     views::View* rating = new views::View();
     rating->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 0, 0));
     layout->AddView(rating);
     prompt.AppendRatingStars(AddResourceIcon, rating);
 
-    views::Label* rating_count = new views::Label(prompt.GetRatingCount());
+    views::Label* rating_count = new views::Label(
+        UTF16ToWide(prompt.GetRatingCount()));
     rating_count->SetFont(
         rating_count->font().DeriveFont(kRatingFontSizeDelta));
     // Add some space between the stars and the rating count.
     rating_count->set_border(views::Border::CreateEmptyBorder(0, 2, 0, 0));
     rating->AddChildView(rating_count);
 
     layout->StartRow(0, column_set_id);
-    views::Label* user_count = new views::Label(prompt.GetUserCount());
+    views::Label* user_count = new views::Label(
+        UTF16ToWide(prompt.GetUserCount()));
     user_count->SetColor(SK_ColorGRAY);
     user_count->SetFont(user_count->font().DeriveFont(kRatingFontSizeDelta));
     layout->AddView(user_count);
 
     layout->StartRow(0, column_set_id);
-    views::Link* store_link = new views::Link(
-        l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_STORE_LINK));
+    views::Link* store_link = new views::Link(UTF16ToWide(
+        l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_STORE_LINK)));
     store_link->SetFont(store_link->font().DeriveFont(kRatingFontSizeDelta));
     store_link->set_listener(this);
     layout->AddView(store_link);
   }
 
   if (prompt.GetPermissionCount()) {
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
     if (is_inline_install()) {
       layout->StartRow(0, column_set_id);
       views::Separator* separator = new views::Separator();
       layout->AddView(separator, 3, 1, GridLayout::FILL, GridLayout::FILL);
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     }
 
     layout->StartRow(0, column_set_id);
-    views::Label* permissions_header = new views::Label(
-        prompt.GetPermissionsHeader());
+    views::Label* permissions_header = new views::Label(UTF16ToWide(
+        prompt.GetPermissionsHeader()));
     permissions_header->SetMultiLine(true);
     permissions_header->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     permissions_header->SizeToFit(left_column_width);
     layout->AddView(permissions_header);
 
     for (size_t i = 0; i < prompt.GetPermissionCount(); ++i) {
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, column_set_id);
       views::Label* permission_label = new views::Label(
-          prompt.GetPermission(i));
+          UTF16ToWide(prompt.GetPermission(i)));
       permission_label->SetMultiLine(true);
       permission_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       permission_label->SizeToFit(left_column_width);
       layout->AddView(permission_label);
     }
   }
 }
 
 ExtensionInstallDialogView::~ExtensionInstallDialogView() {
 }
@@ skipping 72 matching lines @@
   }
 
   ExtensionInstallDialogView* dialog = new ExtensionInstallDialogView(
       delegate, extension, icon, prompt);
 
   views::Widget* window =  browser::CreateViewsWindow(
       browser_window->GetNativeHandle(), dialog);
 
   window->Show();
 }