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

Unified Diff: chrome/browser/chromeos/extensions/info_private_api.cc

Issue 11418048: Add copy and assignment to FundamentalValue and StringValue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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/chromeos/extensions/info_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc
index c09c38a6857c27bcc99c5feade33fa720235c576..bd7ed86a4dd6b5d0d7882894d6ff2bb4904ca374 100644
--- a/chrome/browser/chromeos/extensions/info_private_api.cc
+++ b/chrome/browser/chromeos/extensions/info_private_api.cc
@@ -54,8 +54,8 @@ bool GetChromeosInfoFunction::RunImpl() {
for (size_t i = 0; i < list->GetSize(); ++i) {
std::string property_name;
EXTENSION_FUNCTION_VALIDATE(list->GetString(i, &property_name));
- Value* value = NULL;
- if (GetValue(property_name, &value))
+ Value* value = GetValue(property_name);
+ if (value)
result->Set(property_name, value);
}
SetResult(result.release());
@@ -63,34 +63,33 @@ bool GetChromeosInfoFunction::RunImpl() {
return true;
}
-bool GetChromeosInfoFunction::GetValue(const std::string& property_name,
- Value** value) {
+base::Value* GetChromeosInfoFunction::GetValue(
+ const std::string& property_name) {
if (property_name == kPropertyHWID) {
std::string hwid;
chromeos::system::StatisticsProvider* provider =
chromeos::system::StatisticsProvider::GetInstance();
provider->GetMachineStatistic(kHardwareClass, &hwid);
- *value = Value::CreateStringValue(hwid);
+ return new base::StringValue(hwid);
} else if (property_name == kPropertyHomeProvider) {
NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
- *value = Value::CreateStringValue(netlib->GetCellularHomeCarrierId());
+ return new base::StringValue(netlib->GetCellularHomeCarrierId());
} else if (property_name == kPropertyInitialLocale) {
- *value = Value::CreateStringValue(
+ return new base::StringValue(
chromeos::WizardController::GetInitialLocale());
} else if (property_name == kPropertyBoard) {
std::string board;
chromeos::system::StatisticsProvider* provider =
chromeos::system::StatisticsProvider::GetInstance();
provider->GetMachineStatistic(kPropertyReleaseBoard, &board);
- *value = Value::CreateStringValue(board);
+ return new base::StringValue(board);
} else if (property_name == kPropertyOwner) {
- *value = Value::CreateBooleanValue(
+ return Value::CreateBooleanValue(
chromeos::UserManager::Get()->IsCurrentUserOwner());
- } else {
- LOG(ERROR) << "Unknown property request: " << property_name;
- return false;
}
- return true;
+
+ DLOG(ERROR) << "Unknown property request: " << property_name;
+ return NULL;
}
} // namespace extensions
« no previous file with comments | « chrome/browser/chromeos/extensions/info_private_api.h ('k') | chrome/browser/chromeos/login/user_image_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698