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

Side by Side Diff: chrome/browser/extensions/extension_sync_data.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 4 years, 12 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_sync_data.h" 5 #include "chrome/browser/extensions/extension_sync_data.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 134 }
135 } 135 }
136 136
137 ExtensionSyncData::~ExtensionSyncData() {} 137 ExtensionSyncData::~ExtensionSyncData() {}
138 138
139 // static 139 // static
140 scoped_ptr<ExtensionSyncData> ExtensionSyncData::CreateFromSyncData( 140 scoped_ptr<ExtensionSyncData> ExtensionSyncData::CreateFromSyncData(
141 const syncer::SyncData& sync_data) { 141 const syncer::SyncData& sync_data) {
142 scoped_ptr<ExtensionSyncData> data(new ExtensionSyncData); 142 scoped_ptr<ExtensionSyncData> data(new ExtensionSyncData);
143 if (data->PopulateFromSyncData(sync_data)) 143 if (data->PopulateFromSyncData(sync_data))
144 return data.Pass(); 144 return data;
145 return nullptr; 145 return nullptr;
146 } 146 }
147 147
148 // static 148 // static
149 scoped_ptr<ExtensionSyncData> ExtensionSyncData::CreateFromSyncChange( 149 scoped_ptr<ExtensionSyncData> ExtensionSyncData::CreateFromSyncChange(
150 const syncer::SyncChange& sync_change) { 150 const syncer::SyncChange& sync_change) {
151 scoped_ptr<ExtensionSyncData> data( 151 scoped_ptr<ExtensionSyncData> data(
152 CreateFromSyncData(sync_change.sync_data())); 152 CreateFromSyncData(sync_change.sync_data()));
153 if (!data.get()) 153 if (!data.get())
154 return nullptr; 154 return nullptr;
155 155
156 if (sync_change.change_type() == syncer::SyncChange::ACTION_DELETE) 156 if (sync_change.change_type() == syncer::SyncChange::ACTION_DELETE)
157 data->uninstalled_ = true; 157 data->uninstalled_ = true;
158 return data.Pass(); 158 return data;
159 } 159 }
160 160
161 syncer::SyncData ExtensionSyncData::GetSyncData() const { 161 syncer::SyncData ExtensionSyncData::GetSyncData() const {
162 sync_pb::EntitySpecifics specifics; 162 sync_pb::EntitySpecifics specifics;
163 if (is_app_) 163 if (is_app_)
164 ToAppSpecifics(specifics.mutable_app()); 164 ToAppSpecifics(specifics.mutable_app());
165 else 165 else
166 ToExtensionSpecifics(specifics.mutable_extension()); 166 ToExtensionSpecifics(specifics.mutable_extension());
167 167
168 return syncer::SyncData::CreateLocalData(id_, name_, specifics); 168 return syncer::SyncData::CreateLocalData(id_, name_, specifics);
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 315
316 if (entity_specifics.has_extension()) 316 if (entity_specifics.has_extension())
317 return PopulateFromExtensionSpecifics(entity_specifics.extension()); 317 return PopulateFromExtensionSpecifics(entity_specifics.extension());
318 318
319 LOG(ERROR) << "Attempt to sync bad EntitySpecifics: no extension data."; 319 LOG(ERROR) << "Attempt to sync bad EntitySpecifics: no extension data.";
320 RecordBadSyncData(NO_EXTENSION_SPECIFICS); 320 RecordBadSyncData(NO_EXTENSION_SPECIFICS);
321 return false; 321 return false;
322 } 322 }
323 323
324 } // namespace extensions 324 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_storage_monitor.cc ('k') | chrome/browser/extensions/extension_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698