chrome/browser/chrome_browser_main.cc - Issue 12314090: Add utf_string_conversions to base namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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:

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 995060be2d5ec0c8326fa9c9193deb6ace5c92b5..1361fe64d3e2c99398bd5b8fa2e1c56d922db0c8 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -278,7 +278,7 @@ PrefService* InitializeLocalState(

std::wstring install_lang;

if (GoogleUpdateSettings::GetLanguage(&install_lang)) {

local_state->SetString(prefs::kApplicationLocale,

- WideToASCII(install_lang));

+ base::WideToASCII(install_lang));

}

#endif // defined(OS_WIN)

}

@@ -1186,7 +1186,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {

case ProcessSingleton::PROCESS_NOTIFIED:

#if defined(OS_POSIX) && !defined(OS_MACOSX)

- printf("%s\n", base::SysWideToNativeMB(UTF16ToWide(

+ printf("%s\n", base::SysWideToNativeMB(base::UTF16ToWide(

l10n_util::GetStringUTF16(IDS_USED_EXISTING_BROWSER))).c_str());

#endif

// Having a differentiated return type for testing allows for tests to