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

Side by Side Diff: components/browser_sync/profile_sync_service.cc

Issue 2923453002: Don't move raw pointers in sync (Closed)
Patch Set: More files Created 3 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
« no previous file with comments | « no previous file | components/sync_sessions/sessions_sync_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "components/browser_sync/profile_sync_service.h" 5 #include "components/browser_sync/profile_sync_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cstddef> 9 #include <cstddef>
10 #include <map> 10 #include <map>
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 weak_factory_.GetWeakPtr())); 227 weak_factory_.GetWeakPtr()));
228 sync_sessions::LocalSessionEventRouter* router = 228 sync_sessions::LocalSessionEventRouter* router =
229 sync_client_->GetSyncSessionsClient()->GetLocalSessionEventRouter(); 229 sync_client_->GetSyncSessionsClient()->GetLocalSessionEventRouter();
230 local_device_ = sync_client_->GetSyncApiComponentFactory() 230 local_device_ = sync_client_->GetSyncApiComponentFactory()
231 ->CreateLocalDeviceInfoProvider(); 231 ->CreateLocalDeviceInfoProvider();
232 sync_stopped_reporter_ = base::MakeUnique<syncer::SyncStoppedReporter>( 232 sync_stopped_reporter_ = base::MakeUnique<syncer::SyncStoppedReporter>(
233 sync_service_url_, local_device_->GetSyncUserAgent(), 233 sync_service_url_, local_device_->GetSyncUserAgent(),
234 url_request_context_, syncer::SyncStoppedReporter::ResultCallback()); 234 url_request_context_, syncer::SyncStoppedReporter::ResultCallback());
235 sessions_sync_manager_ = base::MakeUnique<SessionsSyncManager>( 235 sessions_sync_manager_ = base::MakeUnique<SessionsSyncManager>(
236 sync_client_->GetSyncSessionsClient(), &sync_prefs_, local_device_.get(), 236 sync_client_->GetSyncSessionsClient(), &sync_prefs_, local_device_.get(),
237 std::move(router), 237 router,
238 base::Bind(&ProfileSyncService::NotifyForeignSessionUpdated, 238 base::Bind(&ProfileSyncService::NotifyForeignSessionUpdated,
239 sync_enabled_weak_factory_.GetWeakPtr()), 239 sync_enabled_weak_factory_.GetWeakPtr()),
240 base::Bind(&ProfileSyncService::TriggerRefresh, 240 base::Bind(&ProfileSyncService::TriggerRefresh,
241 sync_enabled_weak_factory_.GetWeakPtr(), 241 sync_enabled_weak_factory_.GetWeakPtr(),
242 syncer::ModelTypeSet(syncer::SESSIONS))); 242 syncer::ModelTypeSet(syncer::SESSIONS)));
243 243
244 if (base::FeatureList::IsEnabled(switches::kSyncUSSDeviceInfo)) { 244 if (base::FeatureList::IsEnabled(switches::kSyncUSSDeviceInfo)) {
245 const syncer::ModelTypeStoreFactory& store_factory = 245 const syncer::ModelTypeStoreFactory& store_factory =
246 GetModelTypeStoreFactory(syncer::DEVICE_INFO, base_directory_); 246 GetModelTypeStoreFactory(syncer::DEVICE_INFO, base_directory_);
247 device_info_sync_bridge_ = base::MakeUnique<DeviceInfoSyncBridge>( 247 device_info_sync_bridge_ = base::MakeUnique<DeviceInfoSyncBridge>(
(...skipping 2163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2411 return; 2411 return;
2412 2412
2413 DCHECK(startup_controller_->IsSetupInProgress()); 2413 DCHECK(startup_controller_->IsSetupInProgress());
2414 startup_controller_->SetSetupInProgress(false); 2414 startup_controller_->SetSetupInProgress(false);
2415 2415
2416 if (IsEngineInitialized()) 2416 if (IsEngineInitialized())
2417 ReconfigureDatatypeManager(); 2417 ReconfigureDatatypeManager();
2418 NotifyObservers(); 2418 NotifyObservers();
2419 } 2419 }
2420 } // namespace browser_sync 2420 } // namespace browser_sync
OLDNEW
« no previous file with comments | « no previous file | components/sync_sessions/sessions_sync_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698