| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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/signin/signin_promo.h" | 154 #include "chrome/browser/signin/signin_promo.h" |
| 155 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 155 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 156 #include "components/gcm_driver/gcm_desktop_utils.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" |
| 164 #include "chrome/browser/chromeos/file_system_provider/registry.h" | 165 #include "chrome/browser/chromeos/file_system_provider/registry.h" |
| 165 #include "chrome/browser/chromeos/first_run/first_run.h" | 166 #include "chrome/browser/chromeos/first_run/first_run.h" |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 RegisterBrowserViewProfilePrefs(registry); | 589 RegisterBrowserViewProfilePrefs(registry); |
| 589 RegisterInvertBubbleUserPrefs(registry); | 590 RegisterInvertBubbleUserPrefs(registry); |
| 590 #endif | 591 #endif |
| 591 | 592 |
| 592 #if defined(USE_ASH) | 593 #if defined(USE_ASH) |
| 593 ash::launcher::RegisterChromeLauncherUserPrefs(registry); | 594 ash::launcher::RegisterChromeLauncherUserPrefs(registry); |
| 594 #endif | 595 #endif |
| 595 | 596 |
| 596 #if !defined(OS_ANDROID) | 597 #if !defined(OS_ANDROID) |
| 597 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 598 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| 599 gcm::RegisterProfilePrefs(registry); |
| 598 #endif | 600 #endif |
| 599 | 601 |
| 600 // Preferences registered only for migration (clearing or moving to a new key) | 602 // Preferences registered only for migration (clearing or moving to a new key) |
| 601 // go here. | 603 // go here. |
| 602 | 604 |
| 603 #if defined(OS_WIN) | 605 #if defined(OS_WIN) |
| 604 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); | 606 registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0); |
| 605 #endif // defined(OS_WIN) | 607 #endif // defined(OS_WIN) |
| 606 | 608 |
| 607 #if defined(USE_AURA) | 609 #if defined(USE_AURA) |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 profile_prefs->ClearPref(kCheckDefaultBrowser); | 728 profile_prefs->ClearPref(kCheckDefaultBrowser); |
| 727 | 729 |
| 728 // Added 5/2016. | 730 // Added 5/2016. |
| 729 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); | 731 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); |
| 730 | 732 |
| 731 // Added 7/2016. | 733 // Added 7/2016. |
| 732 DeleteWebRTCIdentityStoreDB(profile); | 734 DeleteWebRTCIdentityStoreDB(profile); |
| 733 } | 735 } |
| 734 | 736 |
| 735 } // namespace chrome | 737 } // namespace chrome |
| OLD | NEW |