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

Unified Diff: ui/base/win/message_box_win.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
« no previous file with comments | « ui/base/win/message_box_win.h ('k') | ui/base/win/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/win/message_box_win.cc
diff --git a/ui/base/win/message_box_win.cc b/ui/base/win/message_box_win.cc
index c78e98baf667782ffa0037d066dad2a074471fdb..6500f9861630b2846d3cab284f0cd0c3b506e4f7 100644
--- a/ui/base/win/message_box_win.cc
+++ b/ui/base/win/message_box_win.cc
@@ -14,8 +14,8 @@ namespace ui {
// RTL locale, we need to make sure that LTR strings are rendered correctly by
// adding the appropriate Unicode directionality marks.
int MessageBox(HWND hwnd,
- const string16& text,
- const string16& caption,
+ const base::string16& text,
+ const base::string16& caption,
UINT flags) {
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoMessageBox))
return IDOK;
@@ -24,11 +24,11 @@ int MessageBox(HWND hwnd,
if (base::i18n::IsRTL())
actual_flags |= MB_RIGHT | MB_RTLREADING;
- string16 localized_text = text;
+ base::string16 localized_text = text;
base::i18n::AdjustStringForLocaleDirection(&localized_text);
const wchar_t* text_ptr = localized_text.c_str();
- string16 localized_caption = caption;
+ base::string16 localized_caption = caption;
base::i18n::AdjustStringForLocaleDirection(&localized_caption);
const wchar_t* caption_ptr = localized_caption.c_str();
« no previous file with comments | « ui/base/win/message_box_win.h ('k') | ui/base/win/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698