| 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 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1390 registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED, | 1390 registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED, |
| 1391 Source<Profile>(this)); | 1391 Source<Profile>(this)); |
| 1392 } | 1392 } |
| 1393 } | 1393 } |
| 1394 | 1394 |
| 1395 void ProfileImpl::StopCreateSessionServiceTimer() { | 1395 void ProfileImpl::StopCreateSessionServiceTimer() { |
| 1396 create_session_service_timer_.Stop(); | 1396 create_session_service_timer_.Stop(); |
| 1397 } | 1397 } |
| 1398 | 1398 |
| 1399 ProfileSyncService* ProfileImpl::GetProfileSyncService() { | 1399 ProfileSyncService* ProfileImpl::GetProfileSyncService() { |
| 1400 #if defined(BROWSER_SYNC) | 1400 #if defined(BROWSER_SYNC) && !defined(OS_POSIX) |
| 1401 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { | 1401 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { |
| 1402 if (!sync_service_.get()) | 1402 if (!sync_service_.get()) |
| 1403 InitSyncService(); | 1403 InitSyncService(); |
| 1404 return sync_service_.get(); | 1404 return sync_service_.get(); |
| 1405 } | 1405 } |
| 1406 #endif | 1406 #endif |
| 1407 return NULL; | 1407 return NULL; |
| 1408 } | 1408 } |
| 1409 | 1409 |
| 1410 void ProfileImpl::InitSyncService() { | 1410 void ProfileImpl::InitSyncService() { |
| 1411 #if defined(BROWSER_SYNC) | 1411 #if defined(BROWSER_SYNC) |
| 1412 sync_service_.reset(new ProfileSyncService(this)); | 1412 sync_service_.reset(new ProfileSyncService(this)); |
| 1413 sync_service_->Initialize(); | 1413 sync_service_->Initialize(); |
| 1414 #endif | 1414 #endif |
| 1415 } | 1415 } |
| OLD | NEW |