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

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: Addressing DEPS issues 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"
11 #include "chrome/browser/prefs/session_startup_pref.h" 11 #include "chrome/browser/prefs/session_startup_pref.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "components/autofill/core/common/autofill_pref_names.h" 14 #include "components/autofill/core/common/autofill_pref_names.h"
15 #include "components/bookmarks/common/bookmark_pref_names.h" 15 #include "components/bookmarks/common/bookmark_pref_names.h"
16 #include "components/browsing_data/core/pref_names.h" 16 #include "components/browsing_data/core/pref_names.h"
17 #include "components/content_settings/core/common/pref_names.h" 17 #include "components/content_settings/core/common/pref_names.h"
18 #include "components/drive/drive_pref_names.h" 18 #include "components/drive/drive_pref_names.h"
19 #include "components/password_manager/core/common/password_manager_pref_names.h" 19 #include "components/password_manager/core/common/password_manager_pref_names.h"
20 #include "components/prefs/pref_service.h" 20 #include "components/prefs/pref_service.h"
21 #include "components/proximity_auth/proximity_auth_pref_names.h"
21 #include "components/proxy_config/proxy_config_pref_names.h" 22 #include "components/proxy_config/proxy_config_pref_names.h"
22 #include "components/safe_browsing/common/safe_browsing_prefs.h" 23 #include "components/safe_browsing/common/safe_browsing_prefs.h"
23 #include "components/search_engines/default_search_manager.h" 24 #include "components/search_engines/default_search_manager.h"
24 #include "components/spellcheck/browser/pref_names.h" 25 #include "components/spellcheck/browser/pref_names.h"
25 #include "components/translate/core/browser/translate_pref_names.h" 26 #include "components/translate/core/browser/translate_pref_names.h"
26 #include "components/translate/core/browser/translate_prefs.h" 27 #include "components/translate/core/browser/translate_prefs.h"
27 #include "components/url_formatter/url_fixer.h" 28 #include "components/url_formatter/url_fixer.h"
28 #include "extensions/browser/extension_pref_value_map.h" 29 #include "extensions/browser/extension_pref_value_map.h"
29 #include "extensions/browser/extension_pref_value_map_factory.h" 30 #include "extensions/browser/extension_pref_value_map_factory.h"
30 #include "extensions/browser/extension_registry.h" 31 #include "extensions/browser/extension_registry.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 (*s_whitelist)[chromeos::kAccountsPrefShowUserNamesOnSignIn] = 220 (*s_whitelist)[chromeos::kAccountsPrefShowUserNamesOnSignIn] =
220 settings_private::PrefType::PREF_TYPE_BOOLEAN; 221 settings_private::PrefType::PREF_TYPE_BOOLEAN;
221 (*s_whitelist)[chromeos::kAccountsPrefAllowNewUser] = 222 (*s_whitelist)[chromeos::kAccountsPrefAllowNewUser] =
222 settings_private::PrefType::PREF_TYPE_BOOLEAN; 223 settings_private::PrefType::PREF_TYPE_BOOLEAN;
223 (*s_whitelist)[chromeos::kAccountsPrefUsers] = 224 (*s_whitelist)[chromeos::kAccountsPrefUsers] =
224 settings_private::PrefType::PREF_TYPE_LIST; 225 settings_private::PrefType::PREF_TYPE_LIST;
225 (*s_whitelist)[::prefs::kEnableAutoScreenLock] = 226 (*s_whitelist)[::prefs::kEnableAutoScreenLock] =
226 settings_private::PrefType::PREF_TYPE_BOOLEAN; 227 settings_private::PrefType::PREF_TYPE_BOOLEAN;
227 (*s_whitelist)[::prefs::kEnableQuickUnlockFingerprint] = 228 (*s_whitelist)[::prefs::kEnableQuickUnlockFingerprint] =
228 settings_private::PrefType::PREF_TYPE_BOOLEAN; 229 settings_private::PrefType::PREF_TYPE_BOOLEAN;
230 (*s_whitelist)[proximity_auth::prefs::kEasyUnlockProximityThreshold] =
231 settings_private::PrefType::PREF_TYPE_NUMBER;
229 232
230 // Accessibility. 233 // Accessibility.
231 (*s_whitelist)[::prefs::kAccessibilitySpokenFeedbackEnabled] = 234 (*s_whitelist)[::prefs::kAccessibilitySpokenFeedbackEnabled] =
232 settings_private::PrefType::PREF_TYPE_BOOLEAN; 235 settings_private::PrefType::PREF_TYPE_BOOLEAN;
233 (*s_whitelist)[::prefs::kAccessibilityAutoclickEnabled] = 236 (*s_whitelist)[::prefs::kAccessibilityAutoclickEnabled] =
234 settings_private::PrefType::PREF_TYPE_BOOLEAN; 237 settings_private::PrefType::PREF_TYPE_BOOLEAN;
235 (*s_whitelist)[::prefs::kAccessibilityAutoclickDelayMs] = 238 (*s_whitelist)[::prefs::kAccessibilityAutoclickDelayMs] =
236 settings_private::PrefType::PREF_TYPE_BOOLEAN; 239 settings_private::PrefType::PREF_TYPE_BOOLEAN;
237 (*s_whitelist)[::prefs::kAccessibilityCaretHighlightEnabled] = 240 (*s_whitelist)[::prefs::kAccessibilityCaretHighlightEnabled] =
238 settings_private::PrefType::PREF_TYPE_BOOLEAN; 241 settings_private::PrefType::PREF_TYPE_BOOLEAN;
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 ExtensionPrefValueMapFactory::GetForBrowserContext(profile_) 792 ExtensionPrefValueMapFactory::GetForBrowserContext(profile_)
790 ->GetExtensionControllingPref(pref_object.key); 793 ->GetExtensionControllingPref(pref_object.key);
791 if (extension_id.empty()) 794 if (extension_id.empty())
792 return nullptr; 795 return nullptr;
793 796
794 return ExtensionRegistry::Get(profile_)->GetExtensionById( 797 return ExtensionRegistry::Get(profile_)->GetExtensionById(
795 extension_id, ExtensionRegistry::ENABLED); 798 extension_id, ExtensionRegistry::ENABLED);
796 } 799 }
797 800
798 } // namespace extensions 801 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698