| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 extensions::ActivityLog::RegisterProfilePrefs(registry); | 432 extensions::ActivityLog::RegisterProfilePrefs(registry); |
| 433 extensions::launch_util::RegisterProfilePrefs(registry); | 433 extensions::launch_util::RegisterProfilePrefs(registry); |
| 434 ExtensionWebUI::RegisterProfilePrefs(registry); | 434 ExtensionWebUI::RegisterProfilePrefs(registry); |
| 435 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 435 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
| 436 #endif | 436 #endif |
| 437 | 437 |
| 438 #if defined(ENABLE_APP_LIST) | 438 #if defined(ENABLE_APP_LIST) |
| 439 app_list::AppListPrefs::RegisterProfilePrefs(registry); | 439 app_list::AppListPrefs::RegisterProfilePrefs(registry); |
| 440 #endif | 440 #endif |
| 441 | 441 |
| 442 #if defined(ENABLE_FULL_PRINTING) | 442 #if defined(ENABLE_PRINT_PREVIEW) |
| 443 print_dialog_cloud::RegisterProfilePrefs(registry); | 443 print_dialog_cloud::RegisterProfilePrefs(registry); |
| 444 printing::StickySettings::RegisterProfilePrefs(registry); | 444 printing::StickySettings::RegisterProfilePrefs(registry); |
| 445 #endif | 445 #endif |
| 446 | 446 |
| 447 #if defined(ENABLE_MANAGED_USERS) | 447 #if defined(ENABLE_MANAGED_USERS) |
| 448 SupervisedUserService::RegisterProfilePrefs(registry); | 448 SupervisedUserService::RegisterProfilePrefs(registry); |
| 449 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); | 449 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); |
| 450 SupervisedUserSyncService::RegisterProfilePrefs(registry); | 450 SupervisedUserSyncService::RegisterProfilePrefs(registry); |
| 451 #endif | 451 #endif |
| 452 | 452 |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 701 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 702 | 702 |
| 703 // We're done migrating the profile per-host zoom level values, so we clear | 703 // We're done migrating the profile per-host zoom level values, so we clear |
| 704 // them all. | 704 // them all. |
| 705 DictionaryPrefUpdate host_zoom_dictionary_update( | 705 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 706 prefs, prefs::kPerHostZoomLevelsDeprecated); | 706 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 707 host_zoom_dictionary_update->Clear(); | 707 host_zoom_dictionary_update->Clear(); |
| 708 } | 708 } |
| 709 | 709 |
| 710 } // namespace chrome | 710 } // namespace chrome |
| OLD | NEW |