| 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/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 const char kOverscrollMinimumThresholdStartTouchpad[] = | 268 const char kOverscrollMinimumThresholdStartTouchpad[] = |
| 269 "overscroll.minimum_threshold_start_touchpad"; | 269 "overscroll.minimum_threshold_start_touchpad"; |
| 270 const char kOverscrollVerticalThresholdStart[] = | 270 const char kOverscrollVerticalThresholdStart[] = |
| 271 "overscroll.vertical_threshold_start"; | 271 "overscroll.vertical_threshold_start"; |
| 272 const char kOverscrollHorizontalResistThreshold[] = | 272 const char kOverscrollHorizontalResistThreshold[] = |
| 273 "overscroll.horizontal_resist_threshold"; | 273 "overscroll.horizontal_resist_threshold"; |
| 274 const char kOverscrollVerticalResistThreshold[] = | 274 const char kOverscrollVerticalResistThreshold[] = |
| 275 "overscroll.vertical_resist_threshold"; | 275 "overscroll.vertical_resist_threshold"; |
| 276 #endif // defined(USE_AURA) | 276 #endif // defined(USE_AURA) |
| 277 | 277 |
| 278 #if BUILDFLAG(ENABLE_GOOGLE_NOW) |
| 279 // Deprecated 3/2016 |
| 280 const char kGoogleGeolocationAccessEnabled[] = |
| 281 "googlegeolocationaccess.enabled"; |
| 282 #endif |
| 283 |
| 278 } // namespace | 284 } // namespace |
| 279 | 285 |
| 280 namespace chrome { | 286 namespace chrome { |
| 281 | 287 |
| 282 void RegisterLocalState(PrefRegistrySimple* registry) { | 288 void RegisterLocalState(PrefRegistrySimple* registry) { |
| 283 // Please keep this list alphabetized. | 289 // Please keep this list alphabetized. |
| 284 AppListService::RegisterPrefs(registry); | 290 AppListService::RegisterPrefs(registry); |
| 285 browser_shutdown::RegisterPrefs(registry); | 291 browser_shutdown::RegisterPrefs(registry); |
| 286 BrowserProcessImpl::RegisterPrefs(registry); | 292 BrowserProcessImpl::RegisterPrefs(registry); |
| 287 ChromeMetricsServiceClient::RegisterPrefs(registry); | 293 ChromeMetricsServiceClient::RegisterPrefs(registry); |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 registry->RegisterDoublePref(kOverscrollMinimumThresholdStart, 0); | 586 registry->RegisterDoublePref(kOverscrollMinimumThresholdStart, 0); |
| 581 registry->RegisterDoublePref(kOverscrollMinimumThresholdStartTouchpad, 0); | 587 registry->RegisterDoublePref(kOverscrollMinimumThresholdStartTouchpad, 0); |
| 582 registry->RegisterDoublePref(kOverscrollVerticalThresholdStart, 0); | 588 registry->RegisterDoublePref(kOverscrollVerticalThresholdStart, 0); |
| 583 registry->RegisterDoublePref(kOverscrollHorizontalResistThreshold, 0); | 589 registry->RegisterDoublePref(kOverscrollHorizontalResistThreshold, 0); |
| 584 registry->RegisterDoublePref(kOverscrollVerticalResistThreshold, 0); | 590 registry->RegisterDoublePref(kOverscrollVerticalResistThreshold, 0); |
| 585 #endif // defined(USE_AURA) | 591 #endif // defined(USE_AURA) |
| 586 | 592 |
| 587 registry->RegisterListPref(kURLsToRestoreOnStartupOld); | 593 registry->RegisterListPref(kURLsToRestoreOnStartupOld); |
| 588 registry->RegisterInt64Pref(kRestoreStartupURLsMigrationTime, 0); | 594 registry->RegisterInt64Pref(kRestoreStartupURLsMigrationTime, 0); |
| 589 registry->RegisterBooleanPref(kRestoreOnStartupMigrated, false); | 595 registry->RegisterBooleanPref(kRestoreOnStartupMigrated, false); |
| 596 |
| 597 #if BUILDFLAG(ENABLE_GOOGLE_NOW) |
| 598 registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false); |
| 599 #endif |
| 590 } | 600 } |
| 591 | 601 |
| 592 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 602 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 593 RegisterProfilePrefs(registry); | 603 RegisterProfilePrefs(registry); |
| 594 | 604 |
| 595 #if defined(OS_CHROMEOS) | 605 #if defined(OS_CHROMEOS) |
| 596 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); | 606 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); |
| 597 #endif | 607 #endif |
| 598 } | 608 } |
| 599 | 609 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 656 profile_prefs->ClearPref(kMaxSeparationForGestureTouchesInPixels); | 666 profile_prefs->ClearPref(kMaxSeparationForGestureTouchesInPixels); |
| 657 profile_prefs->ClearPref(kSemiLongPressTimeInMs); | 667 profile_prefs->ClearPref(kSemiLongPressTimeInMs); |
| 658 profile_prefs->ClearPref(kOverscrollHorizontalThresholdComplete); | 668 profile_prefs->ClearPref(kOverscrollHorizontalThresholdComplete); |
| 659 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete); | 669 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete); |
| 660 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart); | 670 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart); |
| 661 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad); | 671 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad); |
| 662 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart); | 672 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart); |
| 663 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold); | 673 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold); |
| 664 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); | 674 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); |
| 665 #endif // defined(USE_AURA) | 675 #endif // defined(USE_AURA) |
| 676 |
| 677 #if BUILDFLAG(ENABLE_GOOGLE_NOW) |
| 678 // Added 3/2016. |
| 679 profile_prefs->ClearPref(kGoogleGeolocationAccessEnabled); |
| 680 #endif |
| 666 } | 681 } |
| 667 | 682 |
| 668 } // namespace chrome | 683 } // namespace chrome |
| OLD | NEW |