| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/profile.h" | 5 #include "chrome/browser/profile.h" |
| 6 | 6 |
| 7 #include "app/theme_provider.h" | 7 #include "app/theme_provider.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1348 registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED, | 1348 registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED, |
| 1349 Source<Profile>(this)); | 1349 Source<Profile>(this)); |
| 1350 } | 1350 } |
| 1351 } | 1351 } |
| 1352 | 1352 |
| 1353 void ProfileImpl::StopCreateSessionServiceTimer() { | 1353 void ProfileImpl::StopCreateSessionServiceTimer() { |
| 1354 create_session_service_timer_.Stop(); | 1354 create_session_service_timer_.Stop(); |
| 1355 } | 1355 } |
| 1356 | 1356 |
| 1357 ProfileSyncService* ProfileImpl::GetProfileSyncService() { | 1357 ProfileSyncService* ProfileImpl::GetProfileSyncService() { |
| 1358 #if defined(BROWSER_SYNC) | 1358 #if defined(BROWSER_SYNC) && !defined(OS_POSIX) |
| 1359 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { | 1359 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { |
| 1360 if (!sync_service_.get()) | 1360 if (!sync_service_.get()) |
| 1361 InitSyncService(); | 1361 InitSyncService(); |
| 1362 return sync_service_.get(); | 1362 return sync_service_.get(); |
| 1363 } | 1363 } |
| 1364 #endif | 1364 #endif |
| 1365 return NULL; | 1365 return NULL; |
| 1366 } | 1366 } |
| 1367 | 1367 |
| 1368 void ProfileImpl::InitSyncService() { | 1368 void ProfileImpl::InitSyncService() { |
| 1369 #if defined(BROWSER_SYNC) | 1369 #if defined(BROWSER_SYNC) |
| 1370 sync_service_.reset(new ProfileSyncService(this)); | 1370 sync_service_.reset(new ProfileSyncService(this)); |
| 1371 sync_service_->Initialize(); | 1371 sync_service_->Initialize(); |
| 1372 #endif | 1372 #endif |
| 1373 } | 1373 } |
| OLD | NEW |