| 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 #if defined(TOOLKIT_VIEWS) | 252 #if defined(TOOLKIT_VIEWS) |
| 253 #include "chrome/browser/ui/browser_view_prefs.h" | 253 #include "chrome/browser/ui/browser_view_prefs.h" |
| 254 #endif | 254 #endif |
| 255 | 255 |
| 256 #if defined(USE_ASH) | 256 #if defined(USE_ASH) |
| 257 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 257 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
| 258 #endif | 258 #endif |
| 259 | 259 |
| 260 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 260 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 261 #include "chrome/browser/ui/webui/md_history_ui.h" | 261 #include "chrome/browser/ui/webui/md_history_ui.h" |
| 262 #include "chrome/browser/ui/webui/settings/md_settings_ui.h" |
| 262 #endif | 263 #endif |
| 263 | 264 |
| 264 namespace { | 265 namespace { |
| 265 | 266 |
| 266 #if BUILDFLAG(ENABLE_GOOGLE_NOW) | 267 #if BUILDFLAG(ENABLE_GOOGLE_NOW) |
| 267 // Deprecated 3/2016 | 268 // Deprecated 3/2016 |
| 268 constexpr char kGoogleGeolocationAccessEnabled[] = | 269 constexpr char kGoogleGeolocationAccessEnabled[] = |
| 269 "googlegeolocationaccess.enabled"; | 270 "googlegeolocationaccess.enabled"; |
| 270 #endif | 271 #endif |
| 271 | 272 |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 RegisterBrowserViewProfilePrefs(registry); | 628 RegisterBrowserViewProfilePrefs(registry); |
| 628 RegisterInvertBubbleUserPrefs(registry); | 629 RegisterInvertBubbleUserPrefs(registry); |
| 629 #endif | 630 #endif |
| 630 | 631 |
| 631 #if defined(USE_ASH) | 632 #if defined(USE_ASH) |
| 632 ash::launcher::RegisterChromeLauncherUserPrefs(registry); | 633 ash::launcher::RegisterChromeLauncherUserPrefs(registry); |
| 633 #endif | 634 #endif |
| 634 | 635 |
| 635 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 636 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 636 MdHistoryUI::RegisterProfilePrefs(registry); | 637 MdHistoryUI::RegisterProfilePrefs(registry); |
| 638 settings::MdSettingsUI::RegisterProfilePrefs(registry); |
| 637 #endif | 639 #endif |
| 638 | 640 |
| 639 // Preferences registered only for migration (clearing or moving to a new key) | 641 // Preferences registered only for migration (clearing or moving to a new key) |
| 640 // go here. | 642 // go here. |
| 641 | 643 |
| 642 #if BUILDFLAG(ENABLE_GOOGLE_NOW) | 644 #if BUILDFLAG(ENABLE_GOOGLE_NOW) |
| 643 registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false); | 645 registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false); |
| 644 #endif | 646 #endif |
| 645 | 647 |
| 646 registry->RegisterBooleanPref(kCheckDefaultBrowser, true); | 648 registry->RegisterBooleanPref(kCheckDefaultBrowser, true); |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 if (distro_dict && | 765 if (distro_dict && |
| 764 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) { | 766 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) { |
| 765 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay); | 767 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay); |
| 766 } | 768 } |
| 767 #endif // BUILDFLAG(ENABLE_RLZ) | 769 #endif // BUILDFLAG(ENABLE_RLZ) |
| 768 profile_prefs->ClearPref(kDistroDict); | 770 profile_prefs->ClearPref(kDistroDict); |
| 769 } | 771 } |
| 770 } | 772 } |
| 771 | 773 |
| 772 } // namespace chrome | 774 } // namespace chrome |
| OLD | NEW |