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

Unified Diff: chrome_frame/registry_list_preferences_holder.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/registry_list_preferences_holder.h ('k') | chrome_frame/simple_resource_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/registry_list_preferences_holder.cc
diff --git a/chrome_frame/registry_list_preferences_holder.cc b/chrome_frame/registry_list_preferences_holder.cc
index c54032342628cc7824288cc274f7782109c69482..d22cb4726974e365a707236199d633eb5b416150 100644
--- a/chrome_frame/registry_list_preferences_holder.cc
+++ b/chrome_frame/registry_list_preferences_holder.cc
@@ -13,7 +13,7 @@ RegistryListPreferencesHolder::RegistryListPreferencesHolder() : valid_(false) {
void RegistryListPreferencesHolder::Init(HKEY hive,
const wchar_t* registry_path,
const wchar_t* list_name) {
- string16 list_path(registry_path);
+ base::string16 list_path(registry_path);
list_path += L"\\";
list_path += list_name;
base::win::RegistryValueIterator string_list(hive, list_path.c_str());
@@ -23,9 +23,10 @@ void RegistryListPreferencesHolder::Init(HKEY hive,
valid_ = true;
}
-bool RegistryListPreferencesHolder::ListMatches(const string16& string) const {
+bool RegistryListPreferencesHolder::ListMatches(const base::string16& string)
+ const {
DCHECK(Valid());
- std::vector<string16>::const_iterator iter(values_.begin());
+ std::vector<base::string16>::const_iterator iter(values_.begin());
for (; iter != values_.end(); ++iter) {
if (MatchPattern(string, *iter))
return true;
@@ -35,7 +36,7 @@ bool RegistryListPreferencesHolder::ListMatches(const string16& string) const {
}
void RegistryListPreferencesHolder::AddStringForTesting(
- const string16& string) {
+ const base::string16& string) {
values_.push_back(string);
}
« no previous file with comments | « chrome_frame/registry_list_preferences_holder.h ('k') | chrome_frame/simple_resource_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698