Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: chrome/browser/extensions/api/settings_private/prefs_util.cc

Issue 2973243002: Adding pref to store the user-selected proximity threshold. (Closed)
Patch Set: Fixing browser tests Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/extensions/api/settings_private/prefs_util.h" 5 #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/extensions/chrome_extension_function.h" 9 #include "chrome/browser/extensions/chrome_extension_function.h"
10 #include "chrome/browser/extensions/settings_api_helpers.h" 10 #include "chrome/browser/extensions/settings_api_helpers.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 (*s_whitelist)[chromeos::kAccountsPrefShowUserNamesOnSignIn] = 219 (*s_whitelist)[chromeos::kAccountsPrefShowUserNamesOnSignIn] =
220 settings_private::PrefType::PREF_TYPE_BOOLEAN; 220 settings_private::PrefType::PREF_TYPE_BOOLEAN;
221 (*s_whitelist)[chromeos::kAccountsPrefAllowNewUser] = 221 (*s_whitelist)[chromeos::kAccountsPrefAllowNewUser] =
222 settings_private::PrefType::PREF_TYPE_BOOLEAN; 222 settings_private::PrefType::PREF_TYPE_BOOLEAN;
223 (*s_whitelist)[chromeos::kAccountsPrefUsers] = 223 (*s_whitelist)[chromeos::kAccountsPrefUsers] =
224 settings_private::PrefType::PREF_TYPE_LIST; 224 settings_private::PrefType::PREF_TYPE_LIST;
225 (*s_whitelist)[::prefs::kEnableAutoScreenLock] = 225 (*s_whitelist)[::prefs::kEnableAutoScreenLock] =
226 settings_private::PrefType::PREF_TYPE_BOOLEAN; 226 settings_private::PrefType::PREF_TYPE_BOOLEAN;
227 (*s_whitelist)[::prefs::kEnableQuickUnlockFingerprint] = 227 (*s_whitelist)[::prefs::kEnableQuickUnlockFingerprint] =
228 settings_private::PrefType::PREF_TYPE_BOOLEAN; 228 settings_private::PrefType::PREF_TYPE_BOOLEAN;
229 (*s_whitelist)[::prefs::kEasyUnlockProximityThreshold] =
230 settings_private::PrefType::PREF_TYPE_NUMBER;
229 231
230 // Accessibility. 232 // Accessibility.
231 (*s_whitelist)[::prefs::kAccessibilitySpokenFeedbackEnabled] = 233 (*s_whitelist)[::prefs::kAccessibilitySpokenFeedbackEnabled] =
232 settings_private::PrefType::PREF_TYPE_BOOLEAN; 234 settings_private::PrefType::PREF_TYPE_BOOLEAN;
233 (*s_whitelist)[::prefs::kAccessibilityAutoclickEnabled] = 235 (*s_whitelist)[::prefs::kAccessibilityAutoclickEnabled] =
234 settings_private::PrefType::PREF_TYPE_BOOLEAN; 236 settings_private::PrefType::PREF_TYPE_BOOLEAN;
235 (*s_whitelist)[::prefs::kAccessibilityAutoclickDelayMs] = 237 (*s_whitelist)[::prefs::kAccessibilityAutoclickDelayMs] =
236 settings_private::PrefType::PREF_TYPE_BOOLEAN; 238 settings_private::PrefType::PREF_TYPE_BOOLEAN;
237 (*s_whitelist)[::prefs::kAccessibilityCaretHighlightEnabled] = 239 (*s_whitelist)[::prefs::kAccessibilityCaretHighlightEnabled] =
238 settings_private::PrefType::PREF_TYPE_BOOLEAN; 240 settings_private::PrefType::PREF_TYPE_BOOLEAN;
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 ExtensionPrefValueMapFactory::GetForBrowserContext(profile_) 791 ExtensionPrefValueMapFactory::GetForBrowserContext(profile_)
790 ->GetExtensionControllingPref(pref_object.key); 792 ->GetExtensionControllingPref(pref_object.key);
791 if (extension_id.empty()) 793 if (extension_id.empty())
792 return nullptr; 794 return nullptr;
793 795
794 return ExtensionRegistry::Get(profile_)->GetExtensionById( 796 return ExtensionRegistry::Get(profile_)->GetExtensionById(
795 extension_id, ExtensionRegistry::ENABLED); 797 extension_id, ExtensionRegistry::ENABLED);
796 } 798 }
797 799
798 } // namespace extensions 800 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698