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

chrome/browser/ui/views/avatar_menu_bubble_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/avatar_menu_bubble_view.h"
 
-#include <algorithm>
-
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 34 matching lines @@
     scaled_width = Round(src_width * scale);
   }
   int x = dst_x + (dst_width - scaled_width) / 2;
   int y = dst_y + (dst_height - scaled_height) / 2;
   return gfx::Rect(x, y, scaled_width, scaled_height);
 }
 
 // Delegate to callback when the highlight state of a control changes.
 class HighlightDelegate {
  public:
-  virtual ~HighlightDelegate() {}
   virtual void OnHighlightStateChanged() = 0;
 };
 
 // A custom Link control that forwards highlight state changes. We need to do
 // this to make sure that the ProfileItemView looks highlighted even when
 // the mouse is over this link.
 class EditProfileLink : public views::Link {
  public:
   explicit EditProfileLink(const string16& title,
                            HighlightDelegate* delegate)
-      : views::Link(title),
+      : views::Link(UTF16ToWideHack(title)),
         delegate_(delegate),
         state_(views::CustomButton::BS_NORMAL) {
   }
 
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE {
     views::Link::OnMouseEntered(event);
     state_ = views::CustomButton::BS_HOT;
     delegate_->OnHighlightStateChanged();
   }
 
@@ skipping 32 matching lines @@
     SkBitmap profile_icon = item_.icon;
     if (item_.active) {
       SkBitmap badged_icon = GetBadgedIcon(profile_icon);
       image_view_->SetImage(&badged_icon);
     } else {
       image_view_->SetImage(&profile_icon);
     }
     AddChildView(image_view_);
 
     // Add a label to show the profile name.
-    name_label_ = new views::Label(item_.name);
+    name_label_ = new views::Label(UTF16ToWideHack(item_.name));
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     gfx::Font base_font = rb.GetFont(ResourceBundle::BaseFont);
     int style = item_.active ? gfx::Font::BOLD : 0;
     const int kNameFontDelta = 1;
     name_label_->SetFont(base_font.DeriveFont(kNameFontDelta, style));
     name_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(name_label_);
 
     // Add a label to show the sync state.
-    sync_state_label_ = new views::Label(item_.sync_state);
+    sync_state_label_ = new views::Label(UTF16ToWideHack(item_.sync_state));
     const int kStateFontDelta = -1;
     sync_state_label_->SetFont(base_font.DeriveFont(kStateFontDelta));
     sync_state_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     sync_state_label_->SetEnabled(false);
     AddChildView(sync_state_label_);
 
     // Add an edit profile link.
     edit_link_ = new EditProfileLink(
         l10n_util::GetStringUTF16(IDS_PROFILES_EDIT_PROFILE_LINK), this);
     edit_link_->set_listener(edit_profile_listener);
@@ skipping 95 matching lines @@
     return canvas.ExtractBitmap();
   }
 
   EditProfileLink* edit_link_;
   views::ImageView* image_view_;
   AvatarMenuModel::Item item_;
   views::Label* name_label_;
   views::Label* sync_state_label_;
 };
 
-}  // namespace
+} // namespace
 
 AvatarMenuBubbleView::AvatarMenuBubbleView(Browser* browser)
     : add_profile_link_(NULL),
       browser_(browser) {
   avatar_menu_model_.reset(new AvatarMenuModel(
       &g_browser_process->profile_manager()->GetProfileInfoCache(),
       this, browser_));
   // Build the menu for the first time.
   OnAvatarMenuModelChanged(avatar_menu_model_.get());
 }
@@ skipping 97 matching lines @@
     ProfileItemView* item_view = new ProfileItemView(item, this, this);
     item_view->SetAccessibleName(l10n_util::GetStringFUTF16(
         IDS_PROFILES_SWITCH_TO_PROFILE_ACCESSIBLE_NAME, item.name));
     AddChildView(item_view);
     item_views_.push_back(item_view);
   }
 
   separator_ = new views::Separator();
   AddChildView(separator_);
 
-  add_profile_link_ = new views::Link(
-      l10n_util::GetStringUTF16(IDS_PROFILES_CREATE_NEW_PROFILE_LINK));
+  add_profile_link_ = new views::Link(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_PROFILES_CREATE_NEW_PROFILE_LINK)));
   add_profile_link_->set_listener(this);
   add_profile_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   add_profile_link_->SetNormalColor(SkColorSetRGB(0, 0x79, 0xda));
   AddChildView(add_profile_link_);
 
   PreferredSizeChanged();
 }