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

Side by Side Diff: chrome/browser/sync/chrome_sync_client.cc

Issue 2732333003: [Sync] ModelTypeStore factory shouldn't require valid PSS to function correctly (Closed)
Patch Set: Address comments Created 3 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/sync/chrome_sync_client.h" 5 #include "chrome/browser/sync/chrome_sync_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 prefs::kSavingBrowserHistoryDisabled, sync_service_url, 229 prefs::kSavingBrowserHistoryDisabled, sync_service_url,
230 content::BrowserThread::GetTaskRunnerForThread( 230 content::BrowserThread::GetTaskRunnerForThread(
231 content::BrowserThread::UI), 231 content::BrowserThread::UI),
232 content::BrowserThread::GetTaskRunnerForThread( 232 content::BrowserThread::GetTaskRunnerForThread(
233 content::BrowserThread::DB), 233 content::BrowserThread::DB),
234 token_service, url_request_context_getter, web_data_service_, 234 token_service, url_request_context_getter, web_data_service_,
235 password_store_); 235 password_store_);
236 } 236 }
237 } 237 }
238 238
239 base::SequencedWorkerPool* ChromeSyncClient::GetBlockingPool() {
240 return content::BrowserThread::GetBlockingPool();
241 }
242
239 syncer::SyncService* ChromeSyncClient::GetSyncService() { 243 syncer::SyncService* ChromeSyncClient::GetSyncService() {
240 DCHECK_CURRENTLY_ON(BrowserThread::UI); 244 DCHECK_CURRENTLY_ON(BrowserThread::UI);
241 return ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(profile_); 245 return ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(profile_);
242 } 246 }
243 247
244 PrefService* ChromeSyncClient::GetPrefService() { 248 PrefService* ChromeSyncClient::GetPrefService() {
245 DCHECK_CURRENTLY_ON(BrowserThread::UI); 249 DCHECK_CURRENTLY_ON(BrowserThread::UI);
246 return profile_->GetPrefs(); 250 return profile_->GetPrefs();
247 } 251 }
248 252
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 sync_service->RegisterDataTypeController( 696 sync_service->RegisterDataTypeController(
693 base::MakeUnique<SupervisedUserSyncDataTypeController>( 697 base::MakeUnique<SupervisedUserSyncDataTypeController>(
694 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_)); 698 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_));
695 sync_service->RegisterDataTypeController( 699 sync_service->RegisterDataTypeController(
696 base::MakeUnique<SupervisedUserSyncDataTypeController>( 700 base::MakeUnique<SupervisedUserSyncDataTypeController>(
697 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); 701 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_));
698 #endif 702 #endif
699 } 703 }
700 704
701 } // namespace browser_sync 705 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/chrome_sync_client.h ('k') | chrome/browser/sync/profile_sync_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698