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