chrome/browser/policy/policy_path_parser_win.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/policy/policy_path_parser_win.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/policy/policy_path_parser_win.cc

diff --git a/chrome/browser/policy/policy_path_parser_win.cc b/chrome/browser/policy/policy_path_parser_win.cc

index 26d0e5270df2fb10a4a01ac987cf7a410741bbc4..df97ef5c19fc24bfc2f008bf75aeaee2e1654483 100644

--- a/chrome/browser/policy/policy_path_parser_win.cc

+++ b/chrome/browser/policy/policy_path_parser_win.cc

@@ -154,7 +154,7 @@ void CheckUserDataDirPolicy(base::FilePath* user_data_dir) {

// we don't have to try to load HKCU.

const char* key_name_ascii = (is_chrome_frame ? policy::key::kGCFUserDataDir :

policy::key::kUserDataDir);

- std::wstring key_name(ASCIIToWide(key_name_ascii));

+ std::wstring key_name(base::ASCIIToWide(key_name_ascii));

if (LoadUserDataDirPolicyFromRegistry(HKEY_LOCAL_MACHINE, key_name,

user_data_dir) ||

LoadUserDataDirPolicyFromRegistry(HKEY_CURRENT_USER, key_name,