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

Unified Diff: chrome/common/media_galleries/picasa_types.cc

Issue 1407443002: Remove old C++03 move emulation code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: std::move and reflow Created 5 years, 1 month 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 | « chrome/common/media_galleries/picasa_types.h ('k') | components/nacl/browser/nacl_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/media_galleries/picasa_types.cc
diff --git a/chrome/common/media_galleries/picasa_types.cc b/chrome/common/media_galleries/picasa_types.cc
index c39cbf06f4627095ec292b603c10f0745e09f061..6404259d4d5699e1a5798243b7f5dd52dc07d229 100644
--- a/chrome/common/media_galleries/picasa_types.cc
+++ b/chrome/common/media_galleries/picasa_types.cc
@@ -4,6 +4,8 @@
#include "chrome/common/media_galleries/picasa_types.h"
+#include <utility>
+
#include "base/logging.h"
#include "chrome/common/media_galleries/pmp_constants.h"
@@ -66,26 +68,23 @@ AlbumTableFiles::AlbumTableFiles(const base::FilePath& directory_path)
AlbumTableFiles::~AlbumTableFiles() {
}
-AlbumTableFiles::AlbumTableFiles(RValue other)
- : indicator_file(other.object->indicator_file.Pass()),
- category_file(other.object->category_file.Pass()),
- date_file(other.object->date_file.Pass()),
- filename_file(other.object->filename_file.Pass()),
- name_file(other.object->name_file.Pass()),
- token_file(other.object->token_file.Pass()),
- uid_file(other.object->uid_file.Pass()) {
-}
-
-AlbumTableFiles& AlbumTableFiles::operator=(RValue other) {
- if (this != other.object) {
- indicator_file = other.object->indicator_file.Pass();
- category_file = other.object->category_file.Pass();
- date_file = other.object->date_file.Pass();
- filename_file = other.object->filename_file.Pass();
- name_file = other.object->name_file.Pass();
- token_file = other.object->token_file.Pass();
- uid_file = other.object->uid_file.Pass();
- }
+AlbumTableFiles::AlbumTableFiles(AlbumTableFiles&& other)
+ : indicator_file(std::move(other.indicator_file)),
+ category_file(std::move(other.category_file)),
+ date_file(std::move(other.date_file)),
+ filename_file(std::move(other.filename_file)),
+ name_file(std::move(other.name_file)),
+ token_file(std::move(other.token_file)),
+ uid_file(std::move(other.uid_file)) {}
+
+AlbumTableFiles& AlbumTableFiles::operator=(AlbumTableFiles&& other) {
+ indicator_file = std::move(other.indicator_file);
+ category_file = std::move(other.category_file);
+ date_file = std::move(other.date_file);
+ filename_file = std::move(other.filename_file);
+ name_file = std::move(other.name_file);
+ token_file = std::move(other.token_file);
+ uid_file = std::move(other.uid_file);
return *this;
}
« no previous file with comments | « chrome/common/media_galleries/picasa_types.h ('k') | components/nacl/browser/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698