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/accessibility/invert_bubble_prefs.h" | 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 GOOGLE_URL_TRACKER_PREFS = 1 << 2, | 120 GOOGLE_URL_TRACKER_PREFS = 1 << 2, |
121 }; | 121 }; |
122 | 122 |
123 } // namespace | 123 } // namespace |
124 | 124 |
125 namespace chrome { | 125 namespace chrome { |
126 | 126 |
127 void RegisterLocalState(PrefService* local_state) { | 127 void RegisterLocalState(PrefService* local_state) { |
128 // Prefs in Local State | 128 // Prefs in Local State |
129 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 129 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 130 local_state->RegisterListPref(prefs::kSessionRestoreFilesCycled, |
| 131 PrefService::UNSYNCABLE_PREF); |
130 | 132 |
131 browser_shutdown::RegisterPrefs(local_state); | 133 browser_shutdown::RegisterPrefs(local_state); |
132 ExternalProtocolHandler::RegisterPrefs(local_state); | 134 ExternalProtocolHandler::RegisterPrefs(local_state); |
133 geolocation::RegisterPrefs(local_state); | 135 geolocation::RegisterPrefs(local_state); |
134 IntranetRedirectDetector::RegisterPrefs(local_state); | 136 IntranetRedirectDetector::RegisterPrefs(local_state); |
135 KeywordEditorController::RegisterPrefs(local_state); | 137 KeywordEditorController::RegisterPrefs(local_state); |
136 MetricsLog::RegisterPrefs(local_state); | 138 MetricsLog::RegisterPrefs(local_state); |
137 MetricsService::RegisterPrefs(local_state); | 139 MetricsService::RegisterPrefs(local_state); |
138 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); | 140 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); |
139 ProfileInfoCache::RegisterPrefs(local_state); | 141 ProfileInfoCache::RegisterPrefs(local_state); |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 } | 329 } |
328 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
329 | 331 |
330 current_version |= GOOGLE_URL_TRACKER_PREFS; | 332 current_version |= GOOGLE_URL_TRACKER_PREFS; |
331 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
332 current_version); | 334 current_version); |
333 } | 335 } |
334 } | 336 } |
335 | 337 |
336 } // namespace chrome | 338 } // namespace chrome |
OLD | NEW |