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

Unified Diff: ui/views/controls/textfield/textfield_controller.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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
Index: ui/views/controls/textfield/textfield_controller.cc
diff --git a/ui/views/controls/textfield/textfield_controller.cc b/ui/views/controls/textfield/textfield_controller.cc
index 8f72be8a1c4a53e92484634e9bba29468c45c7b7..e82579653cbfbca48ad907d3ba41e9c4855b63c9 100644
--- a/ui/views/controls/textfield/textfield_controller.cc
+++ b/ui/views/controls/textfield/textfield_controller.cc
@@ -31,8 +31,8 @@ bool TextfieldController::IsItemForCommandIdDynamic(int command_id) const {
return false;
}
-string16 TextfieldController::GetLabelForCommandId(int command_id) const {
- return string16();
+base::string16 TextfieldController::GetLabelForCommandId(int command_id) const {
+ return base::string16();
}
bool TextfieldController::HandlesCommand(int command_id) const {
« no previous file with comments | « ui/views/controls/textfield/textfield_controller.h ('k') | ui/views/controls/textfield/textfield_views_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698