Revert 242455 "Revert 242449 "Update some uses of UTF conversion..."
> Revert 242449 "Update some uses of UTF conversions in chrome/bro..."
>
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> >
> > BUG=330556
> > TEST=no change
> > [email protected]
> >
> > Review URL: https://codereview.chromium.org/120943002
>
> [email protected]
>
> Review URL: https://codereview.chromium.org/103853007
[email protected]
Review URL: https://codereview.chromium.org/120993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242463 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index 38ffa82..fe8965e 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -236,8 +236,9 @@
}
void ChromeBrowserMainPartsWin::ShowMissingLocaleMessageBox() {
- ui::MessageBox(NULL, ASCIIToUTF16(chrome_browser::kMissingLocaleDataMessage),
- ASCIIToUTF16(chrome_browser::kMissingLocaleDataTitle),
+ ui::MessageBox(NULL,
+ base::ASCIIToUTF16(chrome_browser::kMissingLocaleDataMessage),
+ base::ASCIIToUTF16(chrome_browser::kMissingLocaleDataTitle),
MB_OK | MB_ICONERROR | MB_TOPMOST);
}
@@ -281,10 +282,10 @@
base::i18n::AdjustStringForLocaleDirection(&adjusted_string);
dlg_strings.append(adjusted_string);
dlg_strings.push_back('|');
- dlg_strings.append(ASCIIToUTF16(
+ dlg_strings.append(base::ASCIIToUTF16(
base::i18n::IsRTL() ? env_vars::kRtlLocale : env_vars::kLtrLocale));
- env->SetVar(env_vars::kRestartInfo, UTF16ToUTF8(dlg_strings));
+ env->SetVar(env_vars::kRestartInfo, base::UTF16ToUTF8(dlg_strings));
}
// static
