diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 18:49:33 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 18:49:33 +0000 |
| commit | 1fe96d0176a2014e38af43154cd27cbf64cf99bc (patch) | |
| tree | dde084bd7272b178765fae9eb3097910d2b1f9b5 /chrome/browser/chrome_browser_main_win.cc | |
| parent | 28126586a68d2aaed9557c505e10ebc20f50ed5b (diff) | |
| download | chromium_src-1fe96d0176a2014e38af43154cd27cbf64cf99bc.zip chromium_src-1fe96d0176a2014e38af43154cd27cbf64cf99bc.tar.gz chromium_src-1fe96d0176a2014e38af43154cd27cbf64cf99bc.tar.bz2 | |
Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/120943002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_win.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_win.cc | 9 |
1 files changed, 5 insertions, 4 deletions
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 @@ int ChromeBrowserMainPartsWin::PreCreateThreads() { } 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 @@ void ChromeBrowserMainPartsWin::PrepareRestartOnCrashEnviroment( 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 |