Commit dd0d75cb authored by Ryan Hansberry's avatar Ryan Hansberry Committed by Chromium LUCI CQ

[Smart Lock] Remove NOTREACHED hit by virtual chromeos on Linux.

This NOTREACHED() will be restored after correctly preventing it
from being called. This prevention mechanism will take non-trivial
effort and is not urgent.

Bug: 1152491
Change-Id: I952640c42e10e25fa9bdba6dd543f3593d06f923
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617026Reviewed-by: default avatarJames Vecore <vecore@google.com>
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841298}
parent 0c52fafa
...@@ -322,6 +322,8 @@ void EasyUnlockScreenlockStateHandler::ShowHardlockUI() { ...@@ -322,6 +322,8 @@ void EasyUnlockScreenlockStateHandler::ShowHardlockUI() {
} }
bool autoshow = true; bool autoshow = true;
// TODO(crbug.com/1152491): Only call into SetHasShownLoginDisabledMessage()
// if this is a signin screen, not lock screen, context.
if (hardlock_state_ == LOGIN_DISABLED) { if (hardlock_state_ == LOGIN_DISABLED) {
// If Signin with Smart Lock is disabled, only automatically show the // If Signin with Smart Lock is disabled, only automatically show the
// tooltip if it hasn't been shown yet. See https://crbug.com/848893 for // tooltip if it hasn't been shown yet. See https://crbug.com/848893 for
......
...@@ -175,7 +175,10 @@ void ProximityAuthProfilePrefManager::SetHasShownLoginDisabledMessage( ...@@ -175,7 +175,10 @@ void ProximityAuthProfilePrefManager::SetHasShownLoginDisabledMessage(
bool has_shown) { bool has_shown) {
// This is persisted within SyncPrefsToLocalState() instead, since the local // This is persisted within SyncPrefsToLocalState() instead, since the local
// state must act as the source of truth for this pref. // state must act as the source of truth for this pref.
NOTREACHED();
// TODO(crbug.com/1152491): Add a NOTREACHED() to ensure this method is not
// called. It is currently incorrectly, though harmlessly, called by virtual
// Chrome OS on Linux.
} }
bool ProximityAuthProfilePrefManager::HasShownLoginDisabledMessage() const { bool ProximityAuthProfilePrefManager::HasShownLoginDisabledMessage() const {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment