OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true); | 143 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true); |
144 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, true); | 144 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, true); |
145 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. | 145 // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string. |
146 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary, | 146 prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary, |
147 IDS_SPELLCHECK_DICTIONARY); | 147 IDS_SPELLCHECK_DICTIONARY); |
148 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, true); | 148 prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, true); |
149 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, true); | 149 prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, true); |
150 #if defined(OS_LINUX) | 150 #if defined(OS_LINUX) |
151 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, false); | 151 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, false); |
152 #endif | 152 #endif |
| 153 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, FilePath()); |
153 prefs->RegisterStringPref(prefs::kCurrentThemeID, | 154 prefs->RegisterStringPref(prefs::kCurrentThemeID, |
154 UTF8ToWide(BrowserThemeProvider::kDefaultThemeID)); | 155 UTF8ToWide(BrowserThemeProvider::kDefaultThemeID)); |
155 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages); | 156 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages); |
156 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors); | 157 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors); |
157 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints); | 158 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints); |
158 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties); | 159 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties); |
159 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false); | 160 prefs->RegisterBooleanPref(prefs::kDisableExtensions, false); |
160 } | 161 } |
161 | 162 |
162 // static | 163 // static |
(...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1321 } | 1322 } |
1322 if (!sync_service_.get()) | 1323 if (!sync_service_.get()) |
1323 InitSyncService(); | 1324 InitSyncService(); |
1324 return sync_service_.get(); | 1325 return sync_service_.get(); |
1325 } | 1326 } |
1326 | 1327 |
1327 void ProfileImpl::InitSyncService() { | 1328 void ProfileImpl::InitSyncService() { |
1328 sync_service_.reset(new ProfileSyncService(this)); | 1329 sync_service_.reset(new ProfileSyncService(this)); |
1329 sync_service_->Initialize(); | 1330 sync_service_->Initialize(); |
1330 } | 1331 } |
OLD | NEW |