Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

Unified Diff: chrome_frame/policy_settings.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/navigation_constraints.cc ('k') | chrome_frame/protocol_sink_wrap.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/policy_settings.cc
diff --git a/chrome_frame/policy_settings.cc b/chrome_frame/policy_settings.cc
index a3a32562ca793daf358ed07608563a3c2f41fe9a..24032041d54cbba3d34823348c7f6d498d39040f 100644
--- a/chrome_frame/policy_settings.cc
+++ b/chrome_frame/policy_settings.cc
@@ -72,7 +72,7 @@ void PolicySettings::ReadUrlSettings(
base::win::RegKey config_key;
DWORD value = RENDERER_NOT_SPECIFIED;
std::wstring settings_value(
- ASCIIToWide(policy::key::kChromeFrameRendererSettings));
+ base::ASCIIToWide(policy::key::kChromeFrameRendererSettings));
for (int i = 0; i < arraysize(kRootKeys); ++i) {
if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
KEY_READ) == ERROR_SUCCESS) &&
@@ -96,7 +96,8 @@ void PolicySettings::ReadUrlSettings(
policy::key::kRenderInHostList;
EnumerateKeyValues(config_key.Handle(),
- ASCIIToWide(exclusion_list_name).c_str(), renderer_exclusion_list);
+ base::ASCIIToWide(exclusion_list_name).c_str(),
+ renderer_exclusion_list);
DVLOG(1) << "Default renderer as specified via policy: "
<< *default_renderer
@@ -113,7 +114,8 @@ void PolicySettings::ReadMetadataCheckSettings(
base::win::RegKey config_key;
DWORD value = SKIP_METADATA_CHECK_NOT_SPECIFIED;
- base::string16 settings_value(ASCIIToWide(policy::key::kSkipMetadataCheck));
+ base::string16 settings_value(
+ base::ASCIIToWide(policy::key::kSkipMetadataCheck));
for (int i = 0; i < arraysize(kRootKeys); ++i) {
if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
KEY_READ) == ERROR_SUCCESS) &&
@@ -144,7 +146,7 @@ void PolicySettings::ReadContentTypeSetting(
std::wstring sub_key(policy::kRegistryChromePolicyKey);
sub_key += L"\\";
- sub_key += ASCIIToWide(policy::key::kChromeFrameContentTypes);
+ sub_key += base::ASCIIToWide(policy::key::kChromeFrameContentTypes);
content_type_list->clear();
for (int i = 0; i < arraysize(kRootKeys) && content_type_list->empty();
@@ -159,7 +161,7 @@ void PolicySettings::ReadStringSetting(const char* value_name,
DCHECK(value);
value->clear();
base::win::RegKey config_key;
- std::wstring value_name_str(ASCIIToWide(value_name));
+ std::wstring value_name_str(base::ASCIIToWide(value_name));
for (int i = 0; i < arraysize(kRootKeys); ++i) {
if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
KEY_READ) == ERROR_SUCCESS) &&
@@ -174,7 +176,7 @@ void PolicySettings::ReadStringSetting(const char* value_name,
void PolicySettings::ReadBoolSetting(const char* value_name, bool* value) {
DCHECK(value);
base::win::RegKey config_key;
- base::string16 value_name_str(ASCIIToWide(value_name));
+ base::string16 value_name_str(base::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/navigation_constraints.cc ('k') | chrome_frame/protocol_sink_wrap.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698