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

chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_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/bookmarks/bookmark_bar_instructions_view.h"
 
-#include <algorithm>
-
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 
 namespace {
 
 // Horizontal padding, in pixels, between the link and label.
 const int kViewPadding = 6;
 
 }  // namespace
 
 BookmarkBarInstructionsView::BookmarkBarInstructionsView(Delegate* delegate)
     : delegate_(delegate),
       instructions_(NULL),
       import_link_(NULL),
       baseline_(-1),
       updated_colors_(false) {
   instructions_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_BOOKMARKS_NO_ITEMS));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARKS_NO_ITEMS)));
   AddChildView(instructions_);
 
   if (browser_defaults::kShowImportOnBookmarkBar) {
     import_link_ = new views::Link(
-        l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_IMPORT_LINK));
+        UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_IMPORT_LINK)));
     // We don't want the link to alter tab navigation.
     import_link_->set_focusable(false);
     import_link_->set_listener(this);
     AddChildView(import_link_);
   }
 }
 
 gfx::Size BookmarkBarInstructionsView::GetPreferredSize() {
   int ascent = 0, descent = 0, height = 0, width = 0;
   for (int i = 0; i < child_count(); ++i) {
@@ skipping 59 matching lines @@
   const ui::ThemeProvider* theme_provider = GetThemeProvider();
   if (!theme_provider)
     return;
   updated_colors_ = true;
   SkColor text_color =
       theme_provider->GetColor(ThemeService::COLOR_BOOKMARK_TEXT);
   instructions_->SetColor(text_color);
   if (import_link_)
     import_link_->SetColor(text_color);
 }