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

chrome/browser/ui/views/create_application_shortcut_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/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
@@ skipping 75 matching lines @@
   Init(title, description, icon);
 }
 
 void AppInfoView::Init(const string16& title_text,
                        const string16& description_text,
                        const SkBitmap& icon) {
   icon_ = new views::ImageView();
   icon_->SetImage(icon);
   icon_->SetImageSize(gfx::Size(kAppIconSize, kAppIconSize));
 
-  title_ = new views::Label(title_text);
+  title_ = new views::Label(UTF16ToWide(title_text));
   title_->SetMultiLine(true);
   title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   title_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD));
 
   if (!description_text.empty()) {
     PrepareDescriptionLabel(description_text);
   }
 
   SetupLayout();
 }
 
 void AppInfoView::PrepareDescriptionLabel(const string16& description) {
   DCHECK(!description.empty());
 
   static const size_t kMaxLength = 200;
-  static const string16 kEllipsis(ASCIIToUTF16(" ... "));
+  static const wchar_t* const kEllipsis = L" ... ";
 
-  string16 text = description;
+  std::wstring text = UTF16ToWide(description);
   if (text.length() > kMaxLength) {
     text = text.substr(0, kMaxLength);
     text += kEllipsis;
   }
 
   if (description_) {
     description_->SetText(text);
   } else {
     description_ = new views::Label(text);
     description_->SetMultiLine(true);
@@ skipping 19 matching lines @@
 
   if (description_) {
     layout->StartRow(0, kColumnSetId);
     layout->SkipColumns(1);
     layout->AddView(description_);
   }
 }
 
 void AppInfoView::UpdateText(const string16& title,
                              const string16& description) {
-  title_->SetText(title);
+  title_->SetText(UTF16ToWideHack(title));
   PrepareDescriptionLabel(description);
 
   SetupLayout();
 }
 
 void AppInfoView::UpdateIcon(const SkBitmap& new_icon) {
   icon_->SetImage(new_icon);
 }
 
 void AppInfoView::OnPaint(gfx::Canvas* canvas) {
@@ skipping 76 matching lines @@
       menu_check_box_(NULL),
       quick_launch_check_box_(NULL) {}
 
 CreateApplicationShortcutView::~CreateApplicationShortcutView() {}
 
 void CreateApplicationShortcutView::InitControls() {
   // Create controls
   app_info_ = new AppInfoView(shortcut_info_.title, shortcut_info_.description,
                               shortcut_info_.favicon);
   create_shortcuts_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_LABEL));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_LABEL)));
   create_shortcuts_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
   desktop_check_box_ = AddCheckbox(UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_DESKTOP_CHKBOX)),
       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateOnDesktop));
 
   menu_check_box_ = NULL;
   quick_launch_check_box_ = NULL;
 
 #if defined(OS_WIN)
@@ skipping 262 matching lines @@
 // Called by tracker_ when the app's icon is loaded.
 void CreateChromeApplicationShortcutView::OnImageLoaded(
     SkBitmap* image, const ExtensionResource& resource, int index) {
   if (!image || image->isNull())
     image = ExtensionIconSource::LoadImageByResourceId(IDR_APP_DEFAULT_ICON);
 
   shortcut_info_.favicon = *image;
   CHECK(app_info_);
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }