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

Unified Diff: chrome/browser/managed_mode/managed_mode_site_list.cc

Issue 104493005: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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: chrome/browser/managed_mode/managed_mode_site_list.cc
diff --git a/chrome/browser/managed_mode/managed_mode_site_list.cc b/chrome/browser/managed_mode/managed_mode_site_list.cc
index 4d60b26bc73acf7bb5e59694ce52aad016e784e7..115a10b019b29fb95483f0fb525bb3f6df3c9bee 100644
--- a/chrome/browser/managed_mode/managed_mode_site_list.cc
+++ b/chrome/browser/managed_mode/managed_mode_site_list.cc
@@ -68,7 +68,7 @@ int GetCategoryId(const std::string& category) {
// Takes a DictionaryValue entry from the JSON file and fills the whitelist
// (via URL patterns or hostname hashes) and the URL in the corresponding Site
// struct.
-void AddWhitelistEntries(const DictionaryValue* site_dict,
+void AddWhitelistEntries(const base::DictionaryValue* site_dict,
ManagedModeSiteList::Site* site) {
std::vector<std::string>* patterns = &site->patterns;
@@ -173,7 +173,7 @@ void ManagedModeSiteList::GetSites(std::vector<Site>* sites) {
// TODO(bauerb): We need to distinguish between "no category assigned" and
// "not on any site list".
int category_id = 0;
- const ListValue* categories = NULL;
+ const base::ListValue* categories = NULL;
if (entry->GetList(kCategoriesKey, &categories)) {
for (base::ListValue::const_iterator it = categories->begin();
it != categories->end(); ++it) {
@@ -204,7 +204,7 @@ bool ManagedModeSiteList::LazyLoad() {
return false;
}
- DictionaryValue* dict = NULL;
+ base::DictionaryValue* dict = NULL;
if (!value->GetAsDictionary(&dict)) {
LOG(ERROR) << "Site list " << path_.value() << " is invalid";
return false;
@@ -221,19 +221,19 @@ bool ManagedModeSiteList::LazyLoad() {
return false;
}
- ListValue* sites = NULL;
+ base::ListValue* sites = NULL;
if (dict->GetList(kSitesKey, &sites))
sites_.reset(sites->DeepCopy());
- DictionaryValue* categories = NULL;
+ base::DictionaryValue* categories = NULL;
if (dict->GetDictionary(kCategoriesKey, &categories))
categories_.reset(categories->DeepCopy());
return true;
}
-void ManagedModeSiteList::CopyThumbnailUrl(const DictionaryValue* source,
- DictionaryValue* dest) {
+void ManagedModeSiteList::CopyThumbnailUrl(const base::DictionaryValue* source,
+ base::DictionaryValue* dest) {
if (!source->HasKey(kThumbnailKey))
return;

Powered by Google App Engine
This is Rietveld 408576698