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

Unified Diff: extensions/browser/api/runtime/runtime_api.cc

Issue 291453002: Make ExtensionFunction::ArgumentList (PKA MultipleArguments) take a scoped_ptr (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reabse Created 6 years, 7 months 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: extensions/browser/api/runtime/runtime_api.cc
diff --git a/extensions/browser/api/runtime/runtime_api.cc b/extensions/browser/api/runtime/runtime_api.cc
index 9dc3febdc000555f36c07aac866c04fad48fa944..94fb0121f1e7ebb38a2a117029f3e9aa9fd2ea79 100644
--- a/extensions/browser/api/runtime/runtime_api.cc
+++ b/extensions/browser/api/runtime/runtime_api.cc
@@ -460,14 +460,12 @@ ExtensionFunction::ResponseAction RuntimeRequestUpdateCheckFunction::Run() {
void RuntimeRequestUpdateCheckFunction::CheckComplete(
const RuntimeAPIDelegate::UpdateCheckResult& result) {
if (result.success) {
- base::ListValue* results = new base::ListValue;
- results->AppendString(result.response);
base::DictionaryValue* details = new base::DictionaryValue;
- results->Append(details);
details->SetString("version", result.version);
- Respond(MultipleArguments(results));
+ Respond(TwoArguments(new base::StringValue(result.response), details));
} else {
- Respond(SingleArgument(new base::StringValue(result.response)));
+ // HMM(kalman): Why does !success not imply Error()?
+ Respond(OneArgument(new base::StringValue(result.response)));
}
}
@@ -489,8 +487,8 @@ ExtensionFunction::ResponseAction RuntimeGetPlatformInfoFunction::Run() {
->GetPlatformInfo(&info)) {
return RespondNow(Error(kPlatformInfoUnavailable));
}
- return RespondNow(MultipleArguments(
- runtime::GetPlatformInfo::Results::Create(info).release()));
+ return RespondNow(
+ ArgumentList(runtime::GetPlatformInfo::Results::Create(info)));
}
ExtensionFunction::ResponseAction
@@ -511,7 +509,7 @@ RuntimeGetPackageDirectoryEntryFunction::Run() {
base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetString("fileSystemId", filesystem_id);
dict->SetString("baseName", relative_path);
- return RespondNow(SingleArgument(dict));
+ return RespondNow(OneArgument(dict));
}
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/chrome_extension_function.cc ('k') | extensions/browser/api/storage/storage_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698