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

Unified Diff: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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/media_galleries/media_galleries_api.cc
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
index 94a5d84eadca8487713b7b13536e7b1e1cac4198..ca230e2cb833b2ab824032e12bc295829b63d580 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
@@ -7,9 +7,9 @@
#include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
#include <stddef.h>
-
#include <set>
#include <string>
+#include <utility>
#include <vector>
#include "base/callback.h"
@@ -349,20 +349,20 @@ bool MediaGalleriesEventRouter::ExtensionHasScanProgressListener(
void MediaGalleriesEventRouter::OnScanStarted(const std::string& extension_id) {
MediaGalleries::ScanProgressDetails details;
details.type = MediaGalleries::SCAN_PROGRESS_TYPE_START;
- DispatchEventToExtension(
- extension_id, events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
- MediaGalleries::OnScanProgress::kEventName,
- MediaGalleries::OnScanProgress::Create(details).Pass());
+ DispatchEventToExtension(extension_id,
+ events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
+ MediaGalleries::OnScanProgress::kEventName,
+ MediaGalleries::OnScanProgress::Create(details));
}
void MediaGalleriesEventRouter::OnScanCancelled(
const std::string& extension_id) {
MediaGalleries::ScanProgressDetails details;
details.type = MediaGalleries::SCAN_PROGRESS_TYPE_CANCEL;
- DispatchEventToExtension(
- extension_id, events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
- MediaGalleries::OnScanProgress::kEventName,
- MediaGalleries::OnScanProgress::Create(details).Pass());
+ DispatchEventToExtension(extension_id,
+ events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
+ MediaGalleries::OnScanProgress::kEventName,
+ MediaGalleries::OnScanProgress::Create(details));
}
void MediaGalleriesEventRouter::OnScanFinished(
@@ -375,20 +375,20 @@ void MediaGalleriesEventRouter::OnScanFinished(
details.audio_count.reset(new int(file_counts.audio_count));
details.image_count.reset(new int(file_counts.image_count));
details.video_count.reset(new int(file_counts.video_count));
- DispatchEventToExtension(
- extension_id, events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
- MediaGalleries::OnScanProgress::kEventName,
- MediaGalleries::OnScanProgress::Create(details).Pass());
+ DispatchEventToExtension(extension_id,
+ events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
+ MediaGalleries::OnScanProgress::kEventName,
+ MediaGalleries::OnScanProgress::Create(details));
}
void MediaGalleriesEventRouter::OnScanError(
const std::string& extension_id) {
MediaGalleries::ScanProgressDetails details;
details.type = MediaGalleries::SCAN_PROGRESS_TYPE_ERROR;
- DispatchEventToExtension(
- extension_id, events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
- MediaGalleries::OnScanProgress::kEventName,
- MediaGalleries::OnScanProgress::Create(details).Pass());
+ DispatchEventToExtension(extension_id,
+ events::MEDIA_GALLERIES_ON_SCAN_PROGRESS,
+ MediaGalleries::OnScanProgress::kEventName,
+ MediaGalleries::OnScanProgress::Create(details));
}
void MediaGalleriesEventRouter::DispatchEventToExtension(
@@ -406,9 +406,9 @@ void MediaGalleriesEventRouter::DispatchEventToExtension(
if (!router->ExtensionHasEventListener(extension_id, event_name))
return;
- scoped_ptr<extensions::Event> event(
- new extensions::Event(histogram_value, event_name, event_args.Pass()));
- router->DispatchEventToExtension(extension_id, event.Pass());
+ scoped_ptr<extensions::Event> event(new extensions::Event(
+ histogram_value, event_name, std::move(event_args)));
+ router->DispatchEventToExtension(extension_id, std::move(event));
}
void MediaGalleriesEventRouter::OnGalleryChanged(
@@ -416,10 +416,10 @@ void MediaGalleriesEventRouter::OnGalleryChanged(
MediaGalleries::GalleryChangeDetails details;
details.type = MediaGalleries::GALLERY_CHANGE_TYPE_CONTENTS_CHANGED;
details.gallery_id = base::Uint64ToString(gallery_id);
- DispatchEventToExtension(
- extension_id, events::MEDIA_GALLERIES_ON_GALLERY_CHANGED,
- MediaGalleries::OnGalleryChanged::kEventName,
- MediaGalleries::OnGalleryChanged::Create(details).Pass());
+ DispatchEventToExtension(extension_id,
+ events::MEDIA_GALLERIES_ON_GALLERY_CHANGED,
+ MediaGalleries::OnGalleryChanged::kEventName,
+ MediaGalleries::OnGalleryChanged::Create(details));
}
void MediaGalleriesEventRouter::OnGalleryWatchDropped(
@@ -427,10 +427,10 @@ void MediaGalleriesEventRouter::OnGalleryWatchDropped(
MediaGalleries::GalleryChangeDetails details;
details.type = MediaGalleries::GALLERY_CHANGE_TYPE_WATCH_DROPPED;
details.gallery_id = gallery_id;
- DispatchEventToExtension(
- extension_id, events::MEDIA_GALLERIES_ON_GALLERY_CHANGED,
- MediaGalleries::OnGalleryChanged::kEventName,
- MediaGalleries::OnGalleryChanged::Create(details).Pass());
+ DispatchEventToExtension(extension_id,
+ events::MEDIA_GALLERIES_ON_GALLERY_CHANGED,
+ MediaGalleries::OnGalleryChanged::kEventName,
+ MediaGalleries::OnGalleryChanged::Create(details));
}
void MediaGalleriesEventRouter::OnListenerRemoved(
@@ -1047,7 +1047,7 @@ void MediaGalleriesGetMetadataFunction::ConstructNextBlob(
extensions::BlobHolder* holder =
extensions::BlobHolder::FromRenderProcessHost(
render_frame_host()->GetProcess());
- holder->HoldBlobReference(current_blob.Pass());
+ holder->HoldBlobReference(std::move(current_blob));
// Construct the next Blob if necessary.
if (blob_uuids->size() < attached_images->size()) {
« no previous file with comments | « chrome/browser/extensions/api/mdns/mdns_apitest.cc ('k') | chrome/browser/extensions/api/messaging/message_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698