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

views/controls/link.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 "views/controls/link.h"
 
 #include "build/build_config.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>
 #endif
 
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "views/controls/link_listener.h"
 #include "views/events/event.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif
@@ skipping 34 matching lines @@
     *disabled_color = kDisabledColor;
     *normal_color = kNormalColor;
   }
 }
 }
 
 namespace views {
 
 const char Link::kViewClassName[] = "views/Link";
 
-Link::Link()
-    : Label(string16()),
-      listener_(NULL),
-      highlighted_(false) {
+Link::Link() : Label(L""),
+               listener_(NULL),
+               highlighted_(false) {
   Init();
   set_focusable(true);
 }
 
-Link::Link(const string16& title)
-    : Label(title),
-      listener_(NULL),
-      highlighted_(false) {
+Link::Link(const std::wstring& title) : Label(title),
+                                        listener_(NULL),
+                                        highlighted_(false) {
   Init();
   set_focusable(true);
 }
 
 void Link::Init() {
   GetColors(NULL, &highlighted_color_, &disabled_color_, &normal_color_);
   SetColor(normal_color_);
   ValidateStyle();
 }
 
@@ skipping 134 matching lines @@
   } else {
     if (font().GetStyle() & gfx::Font::UNDERLINED) {
       Label::SetFont(
           font().DeriveFont(0, font().GetStyle() & ~gfx::Font::UNDERLINED));
     }
     Label::SetColor(disabled_color_);
   }
 }
 
 }  // namespace views