OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/environment.h" | 9 #include "base/environment.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1336 if (!cloud_print_proxy_service_.get()) | 1336 if (!cloud_print_proxy_service_.get()) |
1337 InitCloudPrintProxyService(); | 1337 InitCloudPrintProxyService(); |
1338 return cloud_print_proxy_service_.get(); | 1338 return cloud_print_proxy_service_.get(); |
1339 } | 1339 } |
1340 | 1340 |
1341 void ProfileImpl::InitSyncService(const std::string& cros_user) { | 1341 void ProfileImpl::InitSyncService(const std::string& cros_user) { |
1342 profile_sync_factory_.reset( | 1342 profile_sync_factory_.reset( |
1343 new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess())); | 1343 new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess())); |
1344 sync_service_.reset( | 1344 sync_service_.reset( |
1345 profile_sync_factory_->CreateProfileSyncService(cros_user)); | 1345 profile_sync_factory_->CreateProfileSyncService(cros_user)); |
| 1346 profile_sync_factory_->RegisterDataTypes(sync_service_.get()); |
1346 sync_service_->Initialize(); | 1347 sync_service_->Initialize(); |
1347 } | 1348 } |
1348 | 1349 |
1349 void ProfileImpl::InitCloudPrintProxyService() { | 1350 void ProfileImpl::InitCloudPrintProxyService() { |
1350 cloud_print_proxy_service_ = new CloudPrintProxyService(this); | 1351 cloud_print_proxy_service_ = new CloudPrintProxyService(this); |
1351 cloud_print_proxy_service_->Initialize(); | 1352 cloud_print_proxy_service_->Initialize(); |
1352 } | 1353 } |
1353 | 1354 |
1354 ChromeBlobStorageContext* ProfileImpl::GetBlobStorageContext() { | 1355 ChromeBlobStorageContext* ProfileImpl::GetBlobStorageContext() { |
1355 if (!blob_storage_context_) { | 1356 if (!blob_storage_context_) { |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1500 return pref_proxy_config_tracker_; | 1501 return pref_proxy_config_tracker_; |
1501 } | 1502 } |
1502 | 1503 |
1503 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { | 1504 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { |
1504 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1505 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
1505 return NULL; | 1506 return NULL; |
1506 if (!prerender_manager_) | 1507 if (!prerender_manager_) |
1507 prerender_manager_ = new prerender::PrerenderManager(this); | 1508 prerender_manager_ = new prerender::PrerenderManager(this); |
1508 return prerender_manager_; | 1509 return prerender_manager_; |
1509 } | 1510 } |
OLD | NEW |