OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/prefs/browser_prefs.h" | 5 #include "chrome/browser/prefs/browser_prefs.h" |
6 | 6 |
7 #include "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
8 #include "chrome/browser/autofill/autofill_manager.h" | 8 #include "chrome/browser/autofill/autofill_manager.h" |
9 #include "chrome/browser/background/background_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
105 | 105 |
106 namespace browser { | 106 namespace browser { |
107 | 107 |
108 void RegisterLocalState(PrefService* local_state) { | 108 void RegisterLocalState(PrefService* local_state) { |
109 // Prefs in Local State | 109 // Prefs in Local State |
110 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 110 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
111 | 111 |
112 AppsPromo::RegisterPrefs(local_state); | 112 AppsPromo::RegisterPrefs(local_state); |
113 browser_shutdown::RegisterPrefs(local_state); | 113 browser_shutdown::RegisterPrefs(local_state); |
114 ExternalProtocolHandler::RegisterPrefs(local_state); | 114 ExternalProtocolHandler::RegisterPrefs(local_state); |
115 FlagsUI::RegisterPrefs(local_state); | |
116 geolocation::RegisterPrefs(local_state); | 115 geolocation::RegisterPrefs(local_state); |
117 GoogleURLTracker::RegisterPrefs(local_state); | 116 GoogleURLTracker::RegisterPrefs(local_state); |
118 IntranetRedirectDetector::RegisterPrefs(local_state); | 117 IntranetRedirectDetector::RegisterPrefs(local_state); |
119 KeywordEditorController::RegisterPrefs(local_state); | 118 KeywordEditorController::RegisterPrefs(local_state); |
120 ManagedMode::RegisterPrefs(local_state); | 119 ManagedMode::RegisterPrefs(local_state); |
121 MetricsLog::RegisterPrefs(local_state); | 120 MetricsLog::RegisterPrefs(local_state); |
122 MetricsService::RegisterPrefs(local_state); | 121 MetricsService::RegisterPrefs(local_state); |
123 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); | 122 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); |
124 ProfileInfoCache::RegisterPrefs(local_state); | 123 ProfileInfoCache::RegisterPrefs(local_state); |
125 ProfileManager::RegisterPrefs(local_state); | 124 ProfileManager::RegisterPrefs(local_state); |
(...skipping 13 matching lines...) Expand all Loading... | |
139 SafeBrowsingService::RegisterPrefs(local_state); | 138 SafeBrowsingService::RegisterPrefs(local_state); |
140 #endif | 139 #endif |
141 | 140 |
142 #if defined(TOOLKIT_VIEWS) | 141 #if defined(TOOLKIT_VIEWS) |
143 BrowserView::RegisterBrowserViewPrefs(local_state); | 142 BrowserView::RegisterBrowserViewPrefs(local_state); |
144 #endif | 143 #endif |
145 | 144 |
146 #if !defined(OS_ANDROID) | 145 #if !defined(OS_ANDROID) |
147 BackgroundModeManager::RegisterPrefs(local_state); | 146 BackgroundModeManager::RegisterPrefs(local_state); |
148 Browser::RegisterPrefs(local_state); | 147 Browser::RegisterPrefs(local_state); |
148 FlagsUI::RegisterPrefs(local_state); | |
battre
2012/03/27 05:58:18
I think if you disable registration of these prefs
Yaron
2012/03/27 16:07:31
Ya, I guess it would crash when we tried to read i
| |
149 NewTabPageHandler::RegisterPrefs(local_state); | 149 NewTabPageHandler::RegisterPrefs(local_state); |
150 printing::PrintJobManager::RegisterPrefs(local_state); | 150 printing::PrintJobManager::RegisterPrefs(local_state); |
151 PromoResourceService::RegisterPrefs(local_state); | 151 PromoResourceService::RegisterPrefs(local_state); |
152 UpgradeDetector::RegisterPrefs(local_state); | 152 UpgradeDetector::RegisterPrefs(local_state); |
153 #endif | 153 #endif |
154 | 154 |
155 #if defined(OS_CHROMEOS) | 155 #if defined(OS_CHROMEOS) |
156 chromeos::AudioHandler::RegisterPrefs(local_state); | 156 chromeos::AudioHandler::RegisterPrefs(local_state); |
157 chromeos::language_prefs::RegisterPrefs(local_state); | 157 chromeos::language_prefs::RegisterPrefs(local_state); |
158 chromeos::NetworkMenuButton::RegisterPrefs(local_state); | 158 chromeos::NetworkMenuButton::RegisterPrefs(local_state); |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
283 } | 283 } |
284 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 284 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
285 | 285 |
286 current_version |= WINDOWS_PREFS; | 286 current_version |= WINDOWS_PREFS; |
287 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 287 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
288 current_version); | 288 current_version); |
289 } | 289 } |
290 } | 290 } |
291 | 291 |
292 } // namespace browser | 292 } // namespace browser |
OLD | NEW |