Skip to content

Commit

Permalink
Smart Lock: Remove whitelist for sign-in enabled pref.
Browse files Browse the repository at this point in the history
This is no longer accessed from JS/HTML.

R=hansberry@chromium.org, reillyg@chromium.org

Bug: 894585
Test: none
Change-Id: Ibfde36a2c8f5c0e2c1853d85ca30d2f8f59121da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1932169
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718786}
  • Loading branch information
James Hawkins authored and Commit Bot committed Nov 25, 2019
1 parent 9e763c4 commit a9f2684
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
8 changes: 0 additions & 8 deletions chrome/browser/extensions/api/settings_private/prefs_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "chromeos/components/proximity_auth/proximity_auth_pref_names.h"
#include "components/autofill/core/common/autofill_prefs.h"
#include "components/bookmarks/common/bookmark_pref_names.h"
#include "components/browsing_data/core/pref_names.h"
Expand Down Expand Up @@ -356,13 +355,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
(*s_whitelist)[ash::prefs::kMessageCenterLockScreenMode] =
settings_api::PrefType::PREF_TYPE_STRING;

// TODO(crbug.com/894585): After M71, only whitelist the Smart Lock 'sign-in
// enabled' pref in the pre-Multidevice case, i.e., when
// kEnableUnifiedMultiDeviceSettings is false. In the Multidevice case, JS
// access to this pref is restricted.
(*s_whitelist)[proximity_auth::prefs::kProximityAuthIsChromeOSLoginEnabled] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;

// Accessibility.
(*s_whitelist)[ash::prefs::kAccessibilitySpokenFeedbackEnabled] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ cr.define('settings', function() {
DISABLED: 'disabled',
};

/** @const {string} */
SmartLockSignInEnabledPrefName = 'proximity_auth.is_chromeos_login_enabled';

return {
SignInEnabledState: SignInEnabledState,
SmartLockSignInEnabledPrefName: SmartLockSignInEnabledPrefName,
};
});

Expand Down

0 comments on commit a9f2684

Please sign in to comment.