Chromium Code Reviews| 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..d83b21be69fba09b476a36f9e0ddfbcb7d2141b5 100644 |
| --- a/chrome/common/media_galleries/picasa_types.cc |
| +++ b/chrome/common/media_galleries/picasa_types.cc |
| @@ -66,26 +66,24 @@ 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) { |
| + DCHECK_NE(this, &other); |
|
danakj
2015/10/15 23:35:06
this is move()ing all the things. i don't see the
dcheng
2015/10/16 00:40:01
See above.
dcheng
2015/10/19 21:29:50
Done.
|
| + 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; |
| } |