| 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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 144 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 145 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" | 145 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" |
| 146 #include "components/ntp_tiles/most_visited_sites.h" | 146 #include "components/ntp_tiles/most_visited_sites.h" |
| 147 #include "components/ntp_tiles/popular_sites.h" | 147 #include "components/ntp_tiles/popular_sites.h" |
| 148 #else | 148 #else |
| 149 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 149 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 150 #include "chrome/browser/upgrade_detector.h" | 150 #include "chrome/browser/upgrade_detector.h" |
| 151 #endif | 151 #endif |
| 152 | 152 |
| 153 #if !defined(OS_ANDROID) | 153 #if !defined(OS_ANDROID) |
| 154 #include "chrome/browser/services/gcm/gcm_product_util.h" |
| 154 #include "chrome/browser/signin/signin_promo.h" | 155 #include "chrome/browser/signin/signin_promo.h" |
| 155 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 156 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 156 #endif | 157 #endif |
| 157 | 158 |
| 158 #if defined(OS_CHROMEOS) | 159 #if defined(OS_CHROMEOS) |
| 159 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 160 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| 160 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 161 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 161 #include "chrome/browser/chromeos/customization/customization_document.h" | 162 #include "chrome/browser/chromeos/customization/customization_document.h" |
| 162 #include "chrome/browser/chromeos/display/display_preferences.h" | 163 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 163 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 164 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
| (...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 RegisterBrowserViewProfilePrefs(registry); | 595 RegisterBrowserViewProfilePrefs(registry); |
| 595 RegisterInvertBubbleUserPrefs(registry); | 596 RegisterInvertBubbleUserPrefs(registry); |
| 596 #endif | 597 #endif |
| 597 | 598 |
| 598 #if defined(USE_ASH) | 599 #if defined(USE_ASH) |
| 599 ash::launcher::RegisterChromeLauncherUserPrefs(registry); | 600 ash::launcher::RegisterChromeLauncherUserPrefs(registry); |
| 600 #endif | 601 #endif |
| 601 | 602 |
| 602 #if !defined(OS_ANDROID) | 603 #if !defined(OS_ANDROID) |
| 603 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 604 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| 605 gcm::RegisterProfilePrefs(registry); |
| 604 #endif | 606 #endif |
| 605 | 607 |
| 606 // Preferences registered only for migration (clearing or moving to a new key) | 608 // Preferences registered only for migration (clearing or moving to a new key) |
| 607 // go here. | 609 // go here. |
| 608 | 610 |
| 609 #if defined(OS_WIN) | 611 #if defined(OS_WIN) |
| 610 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); | 612 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); |
| 611 #endif // defined(OS_WIN) | 613 #endif // defined(OS_WIN) |
| 612 | 614 |
| 613 #if defined(USE_AURA) | 615 #if defined(USE_AURA) |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 737 // Added 5/2016. | 739 // Added 5/2016. |
| 738 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); | 740 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); |
| 739 | 741 |
| 740 // Added 7/2016. | 742 // Added 7/2016. |
| 741 DeleteWebRTCIdentityStoreDB(profile); | 743 DeleteWebRTCIdentityStoreDB(profile); |
| 742 profile_prefs->ClearPref(kNetworkPredictionEnabled); | 744 profile_prefs->ClearPref(kNetworkPredictionEnabled); |
| 743 profile_prefs->ClearPref(kDisableSpdy); | 745 profile_prefs->ClearPref(kDisableSpdy); |
| 744 } | 746 } |
| 745 | 747 |
| 746 } // namespace chrome | 748 } // namespace chrome |
| OLD | NEW |