| 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 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 | 440 |
| 441 #if defined(OS_MACOSX) | 441 #if defined(OS_MACOSX) |
| 442 RegisterBrowserActionsControllerProfilePrefs(registry); | 442 RegisterBrowserActionsControllerProfilePrefs(registry); |
| 443 #endif | 443 #endif |
| 444 | 444 |
| 445 #if defined(OS_WIN) | 445 #if defined(OS_WIN) |
| 446 NetworkProfileBubble::RegisterProfilePrefs(registry); | 446 NetworkProfileBubble::RegisterProfilePrefs(registry); |
| 447 #endif | 447 #endif |
| 448 | 448 |
| 449 #if defined(TOOLKIT_VIEWS) | 449 #if defined(TOOLKIT_VIEWS) |
| 450 RegisterBrowserViewSyncablePrefs(registry); |
| 450 RegisterInvertBubbleUserPrefs(registry); | 451 RegisterInvertBubbleUserPrefs(registry); |
| 451 #elif defined(TOOLKIT_GTK) | 452 #elif defined(TOOLKIT_GTK) |
| 452 BrowserWindowGtk::RegisterProfilePrefs(registry); | 453 BrowserWindowGtk::RegisterProfilePrefs(registry); |
| 453 #endif | 454 #endif |
| 454 | 455 |
| 455 #if defined(USE_ASH) | 456 #if defined(USE_ASH) |
| 456 ash::RegisterChromeLauncherUserPrefs(registry); | 457 ash::RegisterChromeLauncherUserPrefs(registry); |
| 457 #endif | 458 #endif |
| 458 | 459 |
| 459 // Prefs registered only for migration (clearing or moving to a new | 460 // Prefs registered only for migration (clearing or moving to a new |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 570 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 570 current_version); | 571 current_version); |
| 571 } | 572 } |
| 572 | 573 |
| 573 #if defined(OS_CHROMEOS) | 574 #if defined(OS_CHROMEOS) |
| 574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 575 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 575 #endif | 576 #endif |
| 576 } | 577 } |
| 577 | 578 |
| 578 } // namespace chrome | 579 } // namespace chrome |
| OLD | NEW |