chrome_frame/policy_settings.cc - Issue 113143006: Add base:: to string16 in chrome_frame/.

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_frame/policy_settings.cc

Issue 113143006: Add base:: to string16 in chrome_frame/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

Index: chrome_frame/policy_settings.cc

diff --git a/chrome_frame/policy_settings.cc b/chrome_frame/policy_settings.cc

index fb8caf6b862c0cbd2d94647c7676207da6553365..a3a32562ca793daf358ed07608563a3c2f41fe9a 100644

--- a/chrome_frame/policy_settings.cc

+++ b/chrome_frame/policy_settings.cc

@@ -113,8 +113,7 @@ void PolicySettings::ReadMetadataCheckSettings(

base::win::RegKey config_key;

DWORD value = SKIP_METADATA_CHECK_NOT_SPECIFIED;

- string16 settings_value(

- ASCIIToWide(policy::key::kSkipMetadataCheck));

+ base::string16 settings_value(ASCIIToWide(policy::key::kSkipMetadataCheck));

for (int i = 0; i < arraysize(kRootKeys); ++i) {

if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,

KEY_READ) == ERROR_SUCCESS) &&

@@ -175,7 +174,7 @@ void PolicySettings::ReadStringSetting(const char* value_name,

void PolicySettings::ReadBoolSetting(const char* value_name, bool* value) {

DCHECK(value);

base::win::RegKey config_key;

- string16 value_name_str(ASCIIToWide(value_name));

+ base::string16 value_name_str(ASCIIToWide(value_name));

DWORD dword_value = 0;

for (int i = 0; i < arraysize(kRootKeys); ++i) {

if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,

« no previous file with comments | « chrome_frame/metrics_service.cc ('k') | chrome_frame/registry_list_preferences_holder.h » ('j') | no next file with comments »