| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 prefs->RegisterBooleanPref(prefs::kEnableUserScripts, false); | 128 prefs->RegisterBooleanPref(prefs::kEnableUserScripts, false); |
| 129 #if defined(OS_LINUX) | 129 #if defined(OS_LINUX) |
| 130 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, false); | 130 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, false); |
| 131 #endif | 131 #endif |
| 132 prefs->RegisterStringPref(prefs::kCurrentThemeID, | 132 prefs->RegisterStringPref(prefs::kCurrentThemeID, |
| 133 UTF8ToWide(BrowserThemeProvider::kDefaultThemeID)); | 133 UTF8ToWide(BrowserThemeProvider::kDefaultThemeID)); |
| 134 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages); | 134 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages); |
| 135 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors); | 135 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors); |
| 136 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints); | 136 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints); |
| 137 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties); | 137 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties); |
| 138 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false); | 138 prefs->RegisterBooleanPref(prefs::kEnableExtensions, false); |
| 139 } | 139 } |
| 140 | 140 |
| 141 // static | 141 // static |
| 142 Profile* Profile::CreateProfile(const FilePath& path) { | 142 Profile* Profile::CreateProfile(const FilePath& path) { |
| 143 return new ProfileImpl(path); | 143 return new ProfileImpl(path); |
| 144 } | 144 } |
| 145 | 145 |
| 146 // static | 146 // static |
| 147 URLRequestContext* Profile::GetDefaultRequestContext() { | 147 URLRequestContext* Profile::GetDefaultRequestContext() { |
| 148 return default_request_context_; | 148 return default_request_context_; |
| (...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1280 #endif | 1280 #endif |
| 1281 return NULL; | 1281 return NULL; |
| 1282 } | 1282 } |
| 1283 | 1283 |
| 1284 void ProfileImpl::InitSyncService() { | 1284 void ProfileImpl::InitSyncService() { |
| 1285 #ifdef CHROME_PERSONALIZATION | 1285 #ifdef CHROME_PERSONALIZATION |
| 1286 sync_service_.reset(new ProfileSyncService(this)); | 1286 sync_service_.reset(new ProfileSyncService(this)); |
| 1287 sync_service_->Initialize(); | 1287 sync_service_->Initialize(); |
| 1288 #endif | 1288 #endif |
| 1289 } | 1289 } |
| OLD | NEW |