Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(881)

Unified Diff: views/controls/link.cc

Issue 8113031: Change std::wstring to string16 for views::Label and views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/link.h ('k') | views/controls/message_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/link.cc
diff --git a/views/controls/link.cc b/views/controls/link.cc
index b6874b9e14f0ead0fb0f25a6f317534c8def81c0..99753d0c2de8282044a63cda7a57c97e9d6e77c2 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -11,6 +11,7 @@
#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"
@@ -65,16 +66,18 @@ namespace views {
const char Link::kViewClassName[] = "views/Link";
-Link::Link() : Label(L""),
- listener_(NULL),
- highlighted_(false) {
+Link::Link()
+ : Label(string16()),
+ listener_(NULL),
+ highlighted_(false) {
Init();
set_focusable(true);
}
-Link::Link(const std::wstring& title) : Label(title),
- listener_(NULL),
- highlighted_(false) {
+Link::Link(const string16& title)
+ : Label(title),
+ listener_(NULL),
+ highlighted_(false) {
Init();
set_focusable(true);
}
« no previous file with comments | « views/controls/link.h ('k') | views/controls/message_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698