Commit 1e48a0bb authored by Alexander Alekseev's avatar Alexander Alekseev Committed by Commit Bot

Chrome OS: First run PIN setup should be shown only when not disabled by policy.

Bug: 901107
Change-Id: Ieb943ad33a824318ea391b626285e6c4b8a71fc4
Reviewed-on: https://chromium-review.googlesource.com/c/1313929Reviewed-by: default avatarJacob Dufault <jdufault@chromium.org>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605056}
parent 4dc66411
...@@ -5,8 +5,11 @@ ...@@ -5,8 +5,11 @@
#include "chrome/browser/chromeos/login/screens/discover_screen.h" #include "chrome/browser/chromeos/login/screens/discover_screen.h"
#include "base/logging.h" #include "base/logging.h"
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
#include "chrome/browser/chromeos/login/screens/discover_screen_view.h" #include "chrome/browser/chromeos/login/screens/discover_screen_view.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/ash/tablet_mode_client.h" #include "chrome/browser/ui/ash/tablet_mode_client.h"
#include "components/prefs/pref_service.h"
namespace chromeos { namespace chromeos {
...@@ -27,8 +30,11 @@ DiscoverScreen::~DiscoverScreen() { ...@@ -27,8 +30,11 @@ DiscoverScreen::~DiscoverScreen() {
} }
void DiscoverScreen::Show() { void DiscoverScreen::Show() {
PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
if (IsPublicSessionOrEphemeralLogin() || if (IsPublicSessionOrEphemeralLogin() ||
!TabletModeClient::Get()->tablet_mode_enabled()) { !TabletModeClient::Get()->tablet_mode_enabled() ||
!chromeos::quick_unlock::IsPinEnabled(prefs) ||
chromeos::quick_unlock::IsPinDisabledByPolicy(prefs)) {
Finish(ScreenExitCode::DISCOVER_FINISHED); Finish(ScreenExitCode::DISCOVER_FINISHED);
return; return;
} }
......
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