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

chrome/browser/ui/views/infobars/infobar_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/infobars/infobar_view.h"
 
-#if defined(OS_WIN)
-#include <shellapi.h>
-#endif
-
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
 #include "chrome/browser/ui/views/infobars/infobar_button_border.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/image/image.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/widget/widget.h"
 #include "views/window/non_client_view.h"
 
 #if defined(OS_WIN)
+#include <shellapi.h>
+
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/icon_util.h"
 #endif
 
 // static
 const int InfoBar::kSeparatorLineHeight =
     views::NonClientFrameView::kClientEdgeThickness;
 const int InfoBar::kDefaultArrowTargetHeight = 9;
@@ skipping 21 matching lines @@
 
 InfoBarView::~InfoBarView() {
   // We should have closed any open menus in PlatformSpecificHide(), then
   // subclasses' RunMenu() functions should have prevented opening any new ones
   // once we became unowned.
   DCHECK(!menu_runner_.get());
 }
 
 // static
 views::Label* InfoBarView::CreateLabel(const string16& text) {
-  views::Label* label = new views::Label(text,
+  views::Label* label = new views::Label(UTF16ToWideHack(text),
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
   label->SetColor(SK_ColorBLACK);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   return label;
 }
 
 // static
 views::Link* InfoBarView::CreateLink(const string16& text,
                                      views::LinkListener* listener,
                                      const SkColor& background_color) {
   views::Link* link = new views::Link;
-  link->SetText(text);
+  link->SetText(UTF16ToWideHack(text));
   link->SetFont(
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
   link->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   link->set_listener(listener);
   link->MakeReadableOverBackgroundColor(background_color);
   return link;
 }
 
 // static
 views::MenuButton* InfoBarView::CreateMenuButton(
@@ skipping 273 matching lines @@
 
 void InfoBarView::FocusWillChange(View* focused_before, View* focused_now) {
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now && !Contains(focused_before) &&
       Contains(focused_now) && GetWidget()) {
     GetWidget()->NotifyAccessibilityEvent(
         this, ui::AccessibilityTypes::EVENT_ALERT, true);
   }
 }