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

Unified Diff: extensions/browser/extension_function.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 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
« no previous file with comments | « extensions/browser/extension_function.h ('k') | extensions/common/event_filtering_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/extension_function.cc
diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc
index 744beaa80347fc0b97cbb8c63c1d46d80af2a28e..46e3ba136953c3f02df46ed287780e1c6b712e36 100644
--- a/extensions/browser/extension_function.cc
+++ b/extensions/browser/extension_function.cc
@@ -273,6 +273,11 @@ void ExtensionFunction::SetResult(base::Value* result) {
results_->Append(result);
}
+void ExtensionFunction::SetResult(scoped_ptr<base::Value> result) {
+ results_.reset(new base::ListValue());
+ results_->Append(result.Pass());
+}
+
void ExtensionFunction::SetResultList(scoped_ptr<base::ListValue> results) {
results_ = results.Pass();
}
« no previous file with comments | « extensions/browser/extension_function.h ('k') | extensions/common/event_filtering_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698