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

chrome/browser/ui/views/extensions/extension_installed_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/extensions/extension_installed_bubble.h"
 
 #include <algorithm>
-#include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 51 matching lines @@
 namespace browser {
 
 void ShowExtensionInstalledBubble(
     const Extension* extension,
     Browser* browser,
     const SkBitmap& icon,
     Profile* profile) {
   ExtensionInstalledBubble::Show(extension, browser, icon);
 }
 
-}  // namespace browser
+} // namespace browser
 
 // InstalledBubbleContent is the content view which is placed in the
 // ExtensionInstalledBubble. It displays the install icon and explanatory
 // text about the installed extension.
 class InstalledBubbleContent : public views::View,
                                public views::ButtonListener,
                                public views::LinkListener {
  public:
   InstalledBubbleContent(Browser* browser,
                          const Extension* extension,
@@ skipping 11 matching lines @@
     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_);
 
     string16 extension_name = UTF8ToUTF16(extension->name());
     base::i18n::AdjustStringForLocaleDirection(&extension_name);
-    heading_ = new views::Label(
+    heading_ = new views::Label(UTF16ToWide(
         l10n_util::GetStringFUTF16(IDS_EXTENSION_INSTALLED_HEADING,
-                                   extension_name));
+                                   extension_name)));
     heading_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
     heading_->SetMultiLine(true);
     heading_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(heading_);
 
     switch (type_) {
       case ExtensionInstalledBubble::PAGE_ACTION: {
-        info_ = new views::Label(l10n_util::GetStringUTF16(
-            IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO));
+        info_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+            IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO)));
         info_->SetFont(font);
         info_->SetMultiLine(true);
         info_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
         AddChildView(info_);
         break;
       }
       case ExtensionInstalledBubble::OMNIBOX_KEYWORD: {
-        info_ = new views::Label(l10n_util::GetStringFUTF16(
+        info_ = new views::Label(UTF16ToWide(l10n_util::GetStringFUTF16(
             IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO,
-            UTF8ToUTF16(extension->omnibox_keyword())));
+            UTF8ToUTF16(extension->omnibox_keyword()))));
         info_->SetFont(font);
         info_->SetMultiLine(true);
         info_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
         AddChildView(info_);
         break;
       }
       case ExtensionInstalledBubble::APP: {
-        views::Link* link = new views::Link(
-            l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_APP_INFO));
+        views::Link* link = new views::Link(UTF16ToWide(
+            l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_APP_INFO)));
         link->set_listener(this);
         manage_ = link;
         manage_->SetFont(font);
         manage_->SetMultiLine(true);
         manage_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
         AddChildView(manage_);
         break;
       }
       default:
         break;
     }
 
     if (type_ != ExtensionInstalledBubble::APP) {
-      manage_ = new views::Label(
-          l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_MANAGE_INFO));
+      manage_ = new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_MANAGE_INFO)));
       manage_->SetFont(font);
       manage_->SetMultiLine(true);
       manage_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       AddChildView(manage_);
     }
 
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::BS_NORMAL,
         rb.GetBitmapNamed(IDR_CLOSE_BAR));
     close_button_->SetImage(views::CustomButton::BS_HOT,
@@ skipping 254 matching lines @@
   Release();  // Balanced in ctor.
 }
 
 bool ExtensionInstalledBubble::CloseOnEscape() {
   return true;
 }
 
 bool ExtensionInstalledBubble::FadeInOnShow() {
   return true;
 }