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

Unified Diff: chrome/browser/extensions/api/developer_private/developer_private_api.cc

Issue 1811413002: [Extensions] Update generated code to support move operations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: compile fix Created 4 years, 9 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: chrome/browser/extensions/api/developer_private/developer_private_api.cc
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index 2604a1acd8649a52cf054ddd749d2c1ccb66a81c..52b4ff9f17356b3294f9b4d1ba198014d4a82fe8 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -388,25 +388,19 @@ void DeveloperPrivateEventRouter::BroadcastItemStateChangedHelper(
developer::EventType event_type,
const std::string& extension_id,
scoped_ptr<ExtensionInfoGenerator> info_generator,
- const ExtensionInfoGenerator::ExtensionInfoList& infos) {
+ ExtensionInfoGenerator::ExtensionInfoList infos) {
DCHECK_LE(infos.size(), 1u);
developer::EventData event_data;
event_data.event_type = event_type;
event_data.item_id = extension_id;
- scoped_ptr<base::DictionaryValue> dict = event_data.ToValue();
-
if (!infos.empty()) {
- // Hack: Ideally, we would use event_data.extension_info to set the
- // extension info, but since it's an optional field, it's implemented as a
- // scoped ptr, and so ownership between that and the vector of linked ptrs
- // here is, well, messy. Easier to just set it like this.
- dict->SetWithoutPathExpansion("extensionInfo",
- infos[0]->ToValue().release());
+ event_data.extension_info.reset(
+ new developer::ExtensionInfo(std::move(infos[0])));
}
scoped_ptr<base::ListValue> args(new base::ListValue());
- args->Append(dict.release());
+ args->Append(event_data.ToValue());
scoped_ptr<Event> event(
new Event(events::DEVELOPER_PRIVATE_ON_ITEM_STATE_CHANGED,
developer::OnItemStateChanged::kEventName, std::move(args)));
@@ -510,7 +504,7 @@ DeveloperPrivateGetExtensionsInfoFunction::Run() {
}
void DeveloperPrivateGetExtensionsInfoFunction::OnInfosGenerated(
- const ExtensionInfoGenerator::ExtensionInfoList& list) {
+ ExtensionInfoGenerator::ExtensionInfoList list) {
Respond(ArgumentList(developer::GetExtensionsInfo::Results::Create(list)));
}
@@ -538,11 +532,10 @@ DeveloperPrivateGetExtensionInfoFunction::Run() {
}
void DeveloperPrivateGetExtensionInfoFunction::OnInfosGenerated(
- const ExtensionInfoGenerator::ExtensionInfoList& list) {
- DCHECK_EQ(1u, list.size());
- const linked_ptr<developer::ExtensionInfo>& info = list[0];
- Respond(info.get() ? OneArgument(info->ToValue()) :
- Error(kNoSuchExtensionError));
+ ExtensionInfoGenerator::ExtensionInfoList list) {
+ DCHECK_LE(1u, list.size());
+ Respond(list.empty() ? Error(kNoSuchExtensionError)
+ : OneArgument(list[0].ToValue()));
}
DeveloperPrivateGetItemsInfoFunction::DeveloperPrivateGetItemsInfoFunction() {}
@@ -564,10 +557,10 @@ ExtensionFunction::ResponseAction DeveloperPrivateGetItemsInfoFunction::Run() {
}
void DeveloperPrivateGetItemsInfoFunction::OnInfosGenerated(
- const ExtensionInfoGenerator::ExtensionInfoList& list) {
- std::vector<linked_ptr<developer::ItemInfo>> item_list;
- for (const linked_ptr<developer::ExtensionInfo>& info : list)
- item_list.push_back(developer_private_mangle::MangleExtensionInfo(*info));
+ ExtensionInfoGenerator::ExtensionInfoList list) {
+ std::vector<developer::ItemInfo> item_list;
+ for (const developer::ExtensionInfo& info : list)
+ item_list.push_back(developer_private_mangle::MangleExtensionInfo(info));
Respond(ArgumentList(developer::GetItemsInfo::Results::Create(item_list)));
}

Powered by Google App Engine
This is Rietveld 408576698