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

Unified Diff: chrome/browser/chromeos/mobile/mobile_activator.cc

Issue 106433007: 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
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager.cc ('k') | chrome/browser/chromeos/mobile_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/mobile/mobile_activator.cc
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc
index cad49ccc2d5ba3296f5730c095988d7323f7fe5f..84f6f58e08fd97b36be4ebd277bb5aedf5abf480 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator.cc
+++ b/chrome/browser/chromeos/mobile/mobile_activator.cc
@@ -122,24 +122,26 @@ bool CellularConfigDocument::LoadFromFile(const base::FilePath& config_path) {
if (!base::ReadFileToString(config_path, &config))
return false;
- scoped_ptr<Value> root(
+ scoped_ptr<base::Value> root(
base::JSONReader::Read(config, base::JSON_ALLOW_TRAILING_COMMAS));
DCHECK(root.get() != NULL);
- if (!root.get() || root->GetType() != Value::TYPE_DICTIONARY) {
+ if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
LOG(WARNING) << "Bad cellular config file";
return false;
}
- DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
+ base::DictionaryValue* root_dict =
+ static_cast<base::DictionaryValue*>(root.get());
if (!root_dict->GetString(kVersionField, &version_)) {
LOG(WARNING) << "Cellular config file missing version";
return false;
}
ErrorMap error_map;
- DictionaryValue* errors = NULL;
+ base::DictionaryValue* errors = NULL;
if (!root_dict->GetDictionary(kErrorsField, &errors))
return false;
- for (DictionaryValue::Iterator it(*errors); !it.IsAtEnd(); it.Advance()) {
+ for (base::DictionaryValue::Iterator it(*errors);
+ !it.IsAtEnd(); it.Advance()) {
std::string value;
if (!it.value().GetAsString(&value)) {
LOG(WARNING) << "Bad cellular config error value";
@@ -286,7 +288,7 @@ void MobileActivator::GetPropertiesAndContinueActivation(
service_path);
return; // Edge case; abort.
}
- const DictionaryValue* payment_dict;
+ const base::DictionaryValue* payment_dict;
std::string usage_url, payment_url;
if (!properties.GetStringWithoutPathExpansion(
shill::kUsageURLProperty, &usage_url) ||
@@ -304,7 +306,7 @@ void MobileActivator::GetPropertiesAndContinueActivation(
DisableCertRevocationChecking();
// We want shill to connect us after activations, so enable autoconnect.
- DictionaryValue auto_connect_property;
+ base::DictionaryValue auto_connect_property;
auto_connect_property.SetBoolean(shill::kAutoConnectProperty, true);
NetworkHandler::Get()->network_configuration_handler()->SetProperties(
service_path_,
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager.cc ('k') | chrome/browser/chromeos/mobile_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698