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

Side by Side Diff: chrome/browser/extensions/app_sync_bundle.cc

Issue 16703018: Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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/app_sync_bundle.h" 5 #include "chrome/browser/extensions/app_sync_bundle.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_sorting.h" 9 #include "chrome/browser/extensions/extension_sorting.h"
10 #include "chrome/common/extensions/extension.h" 10 #include "chrome/common/extensions/extension.h"
11 #include "chrome/common/extensions/extension_set.h" 11 #include "chrome/common/extensions/extension_set.h"
12 #include "chrome/common/extensions/sync_helper.h" 12 #include "chrome/common/extensions/sync_helper.h"
13 #include "sync/api/sync_change_processor.h" 13 #include "sync/api/sync_change_processor.h"
14 #include "sync/api/sync_error_factory.h" 14 #include "sync/api/sync_error_factory.h"
15 15
16 namespace extensions { 16 namespace extensions {
17 17
18 AppSyncBundle::AppSyncBundle(ExtensionService* extension_service) 18 AppSyncBundle::AppSyncBundle(ExtensionService* extension_service)
19 : extension_service_(extension_service), 19 : extension_service_(extension_service) {}
20 sync_processor_(NULL) {}
21 20
22 AppSyncBundle::~AppSyncBundle() {} 21 AppSyncBundle::~AppSyncBundle() {}
23 22
24 void AppSyncBundle::SetupSync( 23 void AppSyncBundle::SetupSync(
25 syncer::SyncChangeProcessor* sync_change_processor, 24 syncer::SyncChangeProcessor* sync_change_processor,
26 syncer::SyncErrorFactory* sync_error_factory, 25 syncer::SyncErrorFactory* sync_error_factory,
27 const syncer::SyncDataList& initial_sync_data) { 26 const syncer::SyncDataList& initial_sync_data) {
28 sync_processor_.reset(sync_change_processor); 27 sync_processor_.reset(sync_change_processor);
29 sync_error_factory_.reset(sync_error_factory); 28 sync_error_factory_.reset(sync_error_factory);
30 29
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 160 }
162 161
163 162
164 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) { 163 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) {
165 pending_sync_data_.erase(id); 164 pending_sync_data_.erase(id);
166 synced_apps_.insert(id); 165 synced_apps_.insert(id);
167 } 166 }
168 167
169 168
170 } // namespace extensions 169 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698