OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 QuitWithAppsController::RegisterPrefs(registry); | 315 QuitWithAppsController::RegisterPrefs(registry); |
316 #endif | 316 #endif |
317 | 317 |
318 #if defined(OS_WIN) | 318 #if defined(OS_WIN) |
319 app_metro_launch::RegisterPrefs(registry); | 319 app_metro_launch::RegisterPrefs(registry); |
320 password_manager::PasswordManager::RegisterLocalPrefs(registry); | 320 password_manager::PasswordManager::RegisterLocalPrefs(registry); |
321 #endif | 321 #endif |
322 | 322 |
323 #if defined(TOOLKIT_VIEWS) | 323 #if defined(TOOLKIT_VIEWS) |
324 RegisterBrowserViewLocalPrefs(registry); | 324 RegisterBrowserViewLocalPrefs(registry); |
325 RegisterTabStripLayoutTypePrefs(registry); | 325 tab_strip_layout_type_prefs::RegisterPrefs(registry); |
326 #endif | 326 #endif |
327 } | 327 } |
328 | 328 |
329 // Register prefs applicable to all profiles. | 329 // Register prefs applicable to all profiles. |
330 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 330 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
331 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); | 331 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); |
332 // User prefs. Please keep this list alphabetized. | 332 // User prefs. Please keep this list alphabetized. |
333 apps::RegisterProfilePrefs(registry); | 333 apps::RegisterProfilePrefs(registry); |
334 autofill::AutofillManager::RegisterProfilePrefs(registry); | 334 autofill::AutofillManager::RegisterProfilePrefs(registry); |
335 bookmark_utils::RegisterProfilePrefs(registry); | 335 bookmark_utils::RegisterProfilePrefs(registry); |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 568 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
569 | 569 |
570 current_version |= GOOGLE_URL_TRACKER_PREFS; | 570 current_version |= GOOGLE_URL_TRACKER_PREFS; |
571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
572 current_version); | 572 current_version); |
573 } | 573 } |
574 | 574 |
575 #if defined(OS_CHROMEOS) | 575 #if defined(OS_CHROMEOS) |
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
577 #endif | 577 #endif |
| 578 |
| 579 #if defined(TOOLKIT_VIEWS) |
| 580 tab_strip_layout_type_prefs::MigratePrefs(local_state); |
| 581 #endif |
578 } | 582 } |
579 | 583 |
580 } // namespace chrome | 584 } // namespace chrome |
OLD | NEW |