summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/dial/dial_api.cc
diff options
context:
space:
mode:
authorrdevlin.cronin <rdevlin.cronin@chromium.org>2016-03-24 14:56:24 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-24 21:57:39 +0000
commitc8e259c41e62ac086c681cff8fddd54fd8e30e73 (patch)
treeb3466af4a16896767b7115e8cef73d116c49b9a7 /chrome/browser/extensions/api/dial/dial_api.cc
parentae96391ad67ebb128d0e0082bdd9633989fd370b (diff)
downloadchromium_src-c8e259c41e62ac086c681cff8fddd54fd8e30e73.zip
chromium_src-c8e259c41e62ac086c681cff8fddd54fd8e30e73.tar.gz
chromium_src-c8e259c41e62ac086c681cff8fddd54fd8e30e73.tar.bz2
[Extensions] Convert APIs to use movable types [4]
Generated extensions code used to rely on linked_ptrs for non-copyable types in containers. Now, we can make these types movable. Update the following APIs to use movable types in this CL: - cryptotoken_private.idl - dashboard_private.json - data_reduction_proxy.json - debugger.json - declarative_content.json - desktop_capture.json - dial.idl - downloads.idl - downloads_internal.idl - easy_unlock_private.idl - echo_private.json - enterprise_device_attributes.idl - enterprise_platform_keys.idl - enterprise_platform_keys_internal.idl - enterprise_platform_keys_private.json - extension.json - feedback_private.idl BUG=595949 Review URL: https://codereview.chromium.org/1822303002 Cr-Commit-Position: refs/heads/master@{#383157}
Diffstat (limited to 'chrome/browser/extensions/api/dial/dial_api.cc')
-rw-r--r--chrome/browser/extensions/api/dial/dial_api.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/extensions/api/dial/dial_api.cc b/chrome/browser/extensions/api/dial/dial_api.cc
index a0a36ce..7e48a95 100644
--- a/chrome/browser/extensions/api/dial/dial_api.cc
+++ b/chrome/browser/extensions/api/dial/dial_api.cc
@@ -98,13 +98,11 @@ void DialAPI::OnDialError(const DialRegistry::DialErrorCode code) {
void DialAPI::SendEventOnUIThread(const DialRegistry::DeviceList& devices) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- std::vector<linked_ptr<api::dial::DialDevice> > args;
- for (DialRegistry::DeviceList::const_iterator it = devices.begin();
- it != devices.end(); ++it) {
- linked_ptr<api::dial::DialDevice> api_device =
- make_linked_ptr(new api::dial::DialDevice);
- it->FillDialDevice(api_device.get());
- args.push_back(api_device);
+ std::vector<api::dial::DialDevice> args;
+ for (const DialDeviceData& device : devices) {
+ api::dial::DialDevice api_device;
+ device.FillDialDevice(&api_device);
+ args.push_back(std::move(api_device));
}
scoped_ptr<base::ListValue> results = api::dial::OnDeviceList::Create(args);
scoped_ptr<Event> event(new Event(events::DIAL_ON_DEVICE_LIST,