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..f869fc5c2cdba3fbbbcf229d73523b3af74ce37e 100644 |
--- a/chrome/common/media_galleries/picasa_types.cc |
+++ b/chrome/common/media_galleries/picasa_types.cc |
@@ -66,26 +66,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(other.indicator_file.Pass()), |
+ category_file(other.category_file.Pass()), |
+ date_file(other.date_file.Pass()), |
+ filename_file(other.filename_file.Pass()), |
+ name_file(other.name_file.Pass()), |
+ token_file(other.token_file.Pass()), |
+ uid_file(other.uid_file.Pass()) {} |
+ |
+AlbumTableFiles& AlbumTableFiles::operator=(AlbumTableFiles&& other) { |
+ indicator_file = other.indicator_file.Pass(); |
+ category_file = other.category_file.Pass(); |
+ date_file = other.date_file.Pass(); |
+ filename_file = other.filename_file.Pass(); |
+ name_file = other.name_file.Pass(); |
+ token_file = other.token_file.Pass(); |
+ uid_file = other.uid_file.Pass(); |
return *this; |
} |