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

Unified Diff: components/policy/core/common/registry_dict_win.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
Index: components/policy/core/common/registry_dict_win.cc
diff --git a/components/policy/core/common/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc
index a843d89630967848e17d2662ec13cdbfd88b2986..47746522dd843675c1bfb039eb906620566c7d99 100644
--- a/components/policy/core/common/registry_dict_win.cc
+++ b/components/policy/core/common/registry_dict_win.cc
@@ -243,13 +243,14 @@ void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
// First, read all the values of the key.
for (RegistryValueIterator it(hive, root.c_str()); it.Valid(); ++it) {
- const std::string name = UTF16ToUTF8(it.Name());
+ const std::string name = base::UTF16ToUTF8(it.Name());
switch (it.Type()) {
case REG_SZ:
case REG_EXPAND_SZ:
SetValue(
name,
- make_scoped_ptr(new base::StringValue(UTF16ToUTF8(it.Value()))));
+ make_scoped_ptr(
+ new base::StringValue(base::UTF16ToUTF8(it.Value()))));
continue;
case REG_DWORD_LITTLE_ENDIAN:
case REG_DWORD_BIG_ENDIAN:
@@ -282,7 +283,7 @@ void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
// Recurse for all subkeys.
for (RegistryKeyIterator it(hive, root.c_str()); it.Valid(); ++it) {
- std::string name(UTF16ToUTF8(it.Name()));
+ std::string name(base::UTF16ToUTF8(it.Name()));
scoped_ptr<RegistryDict> subdict(new RegistryDict());
subdict->ReadRegistry(hive, root + L"\\" + it.Name());
SetKey(name, subdict.Pass());
« no previous file with comments | « components/policy/core/common/preg_parser_win.cc ('k') | components/sessions/serialized_navigation_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698