diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 18:28:30 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 18:28:30 +0000 |
commit | 5bcdd99d8b00c6e727e63fb0c3ecb8c02879accf (patch) | |
tree | ec09a50312f8a1a041ca31dd0549f19e687e4822 /chrome/browser/chromeos/customization_document.cc | |
parent | 88175d62c2d2cc0ab97d77b8370a4f67f0276410 (diff) | |
download | chromium_src-5bcdd99d8b00c6e727e63fb0c3ecb8c02879accf.zip chromium_src-5bcdd99d8b00c6e727e63fb0c3ecb8c02879accf.tar.gz chromium_src-5bcdd99d8b00c6e727e63fb0c3ecb8c02879accf.tar.bz2 |
Update some uses of Value in chrome/browser to use the base:: namespace.
BUG=88666
TEST=no change
R=brettw@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/106433007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/customization_document.cc')
-rw-r--r-- | chrome/browser/chromeos/customization_document.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index 9771417..16fac0a 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -89,16 +89,16 @@ bool CustomizationDocument::LoadManifestFromString( const std::string& manifest) { int error_code = 0; std::string error; - scoped_ptr<Value> root(base::JSONReader::ReadAndReturnError(manifest, + scoped_ptr<base::Value> root(base::JSONReader::ReadAndReturnError(manifest, base::JSON_ALLOW_TRAILING_COMMAS, &error_code, &error)); if (error_code != base::JSONReader::JSON_NO_ERROR) LOG(ERROR) << error; DCHECK(root.get() != NULL); if (root.get() == NULL) return false; - DCHECK(root->GetType() == Value::TYPE_DICTIONARY); - if (root->GetType() == Value::TYPE_DICTIONARY) { - root_.reset(static_cast<DictionaryValue*>(root.release())); + DCHECK(root->GetType() == base::Value::TYPE_DICTIONARY); + if (root->GetType() == base::Value::TYPE_DICTIONARY) { + root_.reset(static_cast<base::DictionaryValue*>(root.release())); std::string result; if (root_->GetString(kVersionAttr, &result) && result == accepted_version_) @@ -114,19 +114,19 @@ std::string CustomizationDocument::GetLocaleSpecificString( const std::string& locale, const std::string& dictionary_name, const std::string& entry_name) const { - DictionaryValue* dictionary_content = NULL; + base::DictionaryValue* dictionary_content = NULL; if (!root_.get() || !root_->GetDictionary(dictionary_name, &dictionary_content)) return std::string(); - DictionaryValue* locale_dictionary = NULL; + base::DictionaryValue* locale_dictionary = NULL; if (dictionary_content->GetDictionary(locale, &locale_dictionary)) { std::string result; if (locale_dictionary->GetString(entry_name, &result)) return result; } - DictionaryValue* default_dictionary = NULL; + base::DictionaryValue* default_dictionary = NULL; if (dictionary_content->GetDictionary(kDefaultAttr, &default_dictionary)) { std::string result; if (default_dictionary->GetString(entry_name, &result)) @@ -175,10 +175,10 @@ void StartupCustomizationDocument::Init( std::string hwid; if (statistics_provider->GetMachineStatistic( chromeos::system::kHardwareClassKey, &hwid)) { - ListValue* hwid_list = NULL; + base::ListValue* hwid_list = NULL; if (root_->GetList(kHwidMapAttr, &hwid_list)) { for (size_t i = 0; i < hwid_list->GetSize(); ++i) { - DictionaryValue* hwid_dictionary = NULL; + base::DictionaryValue* hwid_dictionary = NULL; std::string hwid_mask; if (hwid_list->GetDictionary(i, &hwid_dictionary) && hwid_dictionary->GetString(kHwidMaskAttr, &hwid_mask)) { |