| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "chrome/browser/sync/profile_sync_service.h" | 38 #include "chrome/browser/sync/profile_sync_service.h" |
| 39 #include "chrome/browser/thumbnail_store.h" | 39 #include "chrome/browser/thumbnail_store.h" |
| 40 #include "chrome/browser/visitedlink_master.h" | 40 #include "chrome/browser/visitedlink_master.h" |
| 41 #include "chrome/browser/visitedlink_event_listener.h" | 41 #include "chrome/browser/visitedlink_event_listener.h" |
| 42 #include "chrome/browser/webdata/web_data_service.h" | 42 #include "chrome/browser/webdata/web_data_service.h" |
| 43 #include "chrome/common/appcache/chrome_appcache_service.h" | 43 #include "chrome/common/appcache/chrome_appcache_service.h" |
| 44 #include "chrome/common/chrome_constants.h" | 44 #include "chrome/common/chrome_constants.h" |
| 45 #include "chrome/common/chrome_paths.h" | 45 #include "chrome/common/chrome_paths.h" |
| 46 #include "chrome/common/chrome_switches.h" | 46 #include "chrome/common/chrome_switches.h" |
| 47 #include "chrome/common/extensions/extension_error_reporter.h" | 47 #include "chrome/common/extensions/extension_error_reporter.h" |
| 48 #include "chrome/common/net/cookie_monster_sqlite.h" | |
| 49 #include "chrome/common/notification_service.h" | 48 #include "chrome/common/notification_service.h" |
| 50 #include "chrome/common/pref_names.h" | 49 #include "chrome/common/pref_names.h" |
| 51 #include "chrome/common/render_messages.h" | 50 #include "chrome/common/render_messages.h" |
| 52 #include "grit/locale_settings.h" | 51 #include "grit/locale_settings.h" |
| 53 #include "net/base/strict_transport_security_state.h" | 52 #include "net/base/strict_transport_security_state.h" |
| 54 | 53 |
| 55 #if defined(OS_LINUX) | 54 #if defined(OS_LINUX) |
| 56 #include "net/ocsp/nss_ocsp.h" | 55 #include "net/ocsp/nss_ocsp.h" |
| 57 #include "chrome/browser/gtk/gtk_theme_provider.h" | 56 #include "chrome/browser/gtk/gtk_theme_provider.h" |
| 58 #endif | 57 #endif |
| (...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1321 #endif | 1320 #endif |
| 1322 return NULL; | 1321 return NULL; |
| 1323 } | 1322 } |
| 1324 | 1323 |
| 1325 void ProfileImpl::InitSyncService() { | 1324 void ProfileImpl::InitSyncService() { |
| 1326 #ifdef CHROME_PERSONALIZATION | 1325 #ifdef CHROME_PERSONALIZATION |
| 1327 sync_service_.reset(new ProfileSyncService(this)); | 1326 sync_service_.reset(new ProfileSyncService(this)); |
| 1328 sync_service_->Initialize(); | 1327 sync_service_->Initialize(); |
| 1329 #endif | 1328 #endif |
| 1330 } | 1329 } |
| OLD | NEW |