Chromium Code Reviews| 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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 656 profile_prefs->ClearPref(kMaxSeparationForGestureTouchesInPixels); | 662 profile_prefs->ClearPref(kMaxSeparationForGestureTouchesInPixels); |
| 657 profile_prefs->ClearPref(kSemiLongPressTimeInMs); | 663 profile_prefs->ClearPref(kSemiLongPressTimeInMs); |
| 658 profile_prefs->ClearPref(kOverscrollHorizontalThresholdComplete); | 664 profile_prefs->ClearPref(kOverscrollHorizontalThresholdComplete); |
| 659 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete); | 665 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete); |
| 660 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart); | 666 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart); |
| 661 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad); | 667 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad); |
| 662 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart); | 668 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart); |
| 663 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold); | 669 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold); |
| 664 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); | 670 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); |
| 665 #endif // defined(USE_AURA) | 671 #endif // defined(USE_AURA) |
| 672 | |
| 673 #if BUILDFLAG(ENABLE_GOOGLE_NOW) | |
| 674 // Added 3/2016. | |
| 675 profile_prefs->ClearPref(kGoogleGeolocationAccessEnabled); | |
|
gab
2016/03/14 20:57:36
From its location in pref_names.cc I gather that t
Devlin
2016/03/14 21:19:52
Detangling this pref is kind of a pain, but I thin
gab
2016/03/15 01:20:29
Ah ok, that sounds right then, had only based my r
| |
| 676 #endif | |
| 666 } | 677 } |
| 667 | 678 |
| 668 } // namespace chrome | 679 } // namespace chrome |
| OLD | NEW |