Smart Lock: Display the enterprise controlled state of sign-in pref.

R=khorimoto@chromium.org

Bug: 894598
Test: none
Change-Id: I85bfe11dda29295d45c609851222bd40fff98ef7
Reviewed-on: https://chromium-review.googlesource.com/c/1283486
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600800}

chrome/browser/resources/settings/multidevice_page/BUILD.gn

@@ -67,6 +67,14 @@ js_library("multidevice_page") {
   ]
 }
 
+js_library("multidevice_radio_button") {
+  deps = [
+    "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
+    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button_behavior",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator",
+  ]
+}
+
 js_library("multidevice_smartlock_subpage") {
   deps = [
     ":multidevice_constants",

chrome/browser/resources/settings/multidevice_page/multidevice_browser_proxy.js

@@ -58,6 +58,13 @@ cr.define('settings', function() {
      */
     setSmartLockSignInEnabled(enabled, opt_authToken) {}
 
+    /**
+     * Returns the value of the preference controlling whether Smart Lock
+     * sign-in is allowed.
+     * @return {!Promise<boolean>}
+     */
+    getSmartLockSignInAllowed() {}
+
     /**
      * Returns android messages info with messages feature state
      * and messages for web permissions origin.
@@ -111,6 +118,11 @@ cr.define('settings', function() {
       chrome.send('setSmartLockSignInEnabled', [enabled, opt_authToken]);
     }
 
+    /** @override */
+    getSmartLockSignInAllowed() {
+      return cr.sendWithPromise('getSmartLockSignInAllowed');
+    }
+
     /** @override */
     getAndroidSmsInfo() {
       return cr.sendWithPromise('getAndroidSmsInfo');

chrome/browser/resources/settings/multidevice_page/multidevice_radio_button.html

+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_radio_button_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_radio_button_style_css.html">
+<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicator.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
+<link rel="import" href="../settings_shared_css.html">
+
+<!-- TODO(jhawkins): This is copy/pasted from controlled_radio_button. Figure
+  out how to refactor such that a common UI/behavior may be shared. The only
+  difference is how the controlling preference is read. -->
+<dom-module id="multidevice-radio-button">
+  <template>
+    <style include="settings-shared cr-radio-button-style">
+      :host([disabled]) {
+        opacity: 1;
+      }
+
+      /* Disc and label should be transluscent, but not the policy indicator. */
+      :host([disabled]) .disc-wrapper,
+      :host([disabled]) #labelWrapper {
+        opacity: var(--cr-disabled-opacity);
+      }
+
+      cr-policy-pref-indicator {
+        margin-inline-start: var(--settings-controlled-by-spacing);
+        /* Enable pointer events for the indicator so :hover works. Disable
+         * clicks/taps via onIndicatorTap_ so outer on-tap doesn't trigger. */
+        pointer-events: all;
+      }
+    </style>
+
+    <div class="disc-wrapper">
+      <div class="disc-border"></div>
+      <div class="disc"></div>
+    </div>
+
+    <div id="labelWrapper">
+      <span>[[label]]</span>
+    </div>
+
+    <template is="dom-if" if="[[disabled]]" restamp>
+      <cr-policy-indicator
+          indicator-type="userPolicy"
+          icon-aria-label="[[label]]"
+          on-click="onIndicatorTap_">
+      </cr-policy-indicator>
+    </template>
+
+  </template>
+  <script src="multidevice_radio_button.js"></script>
+</dom-module>

chrome/browser/resources/settings/multidevice_page/multidevice_radio_button.js

+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+Polymer({
+  is: 'multidevice-radio-button',
+
+  behaviors: [
+    CrRadioButtonBehavior,
+  ],
+
+  properties: {
+    disabled: {
+      type: Boolean,
+      reflectToAttribute: true,
+      observer: 'disabledChanged_',
+    },
+
+    name: {
+      type: String,
+      notify: true,
+    },
+  },
+
+  /**
+   * Updates attributes of the control to reflect its disabled state.
+   * @private
+   */
+  disabledChanged_: function() {
+    this.setAttribute('tabindex', this.disabled ? -1 : 0);
+    this.setAttribute('aria-disabled', this.disabled ? 'true' : 'false');
+  },
+
+  /**
+   * Prevents on-click handles on the control from being activated when the
+   * indicator is clicked.
+   * @param {!Event} e The click event.
+   * @private
+   */
+  onIndicatorTap_: function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+  },
+});

chrome/browser/resources/settings/multidevice_page/multidevice_smartlock_subpage.html

@@ -6,6 +6,7 @@
 <link rel="import" href="multidevice_browser_proxy.html">
 <link rel="import" href="multidevice_feature_behavior.html">
 <link rel="import" href="multidevice_feature_toggle.html">
+<link rel="import" href="multidevice_radio_button.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../settings_shared_css.html">
 
@@ -37,19 +38,21 @@
       <div class="list-frame">
         <paper-radio-group
             selected="[[smartLockSignInEnabled_]]"
-            selectable="cr-radio-button"
+            selectable="multidevice-radio-button"
             on-paper-radio-group-changed=
                     "onSmartLockSignInEnabledChanged_">
-          <cr-radio-button
+          <multidevice-radio-button
+              disabled$="[[!smartLockSignInAllowed_]]"
               name="disabled"
               class="list-item underbar"
               label="$i18n{easyUnlockUnlockDeviceOnly}">
-          </cr-radio-button>
-          <cr-radio-button
+          </multidevice-radio-button>
+          <multidevice-radio-button
+              disabled$="[[!smartLockSignInAllowed_]]"
               name="enabled"
               class="list-item"
               label="$i18n{easyUnlockUnlockDeviceAndAllowSignin}">
-          </cr-radio-button>
+          </multidevice-radio-button>
         </paper-radio-group>
       </div>
     </iron-collapse>

chrome/browser/resources/settings/multidevice_page/multidevice_smartlock_subpage.js

@@ -62,6 +62,15 @@ Polymer({
       value: settings.SignInEnabledState.DISABLED,
     },
 
+    /**
+     * True if the user is allowed to enable Smart Lock sign-in.
+     * @private
+     */
+    smartLockSignInAllowed_: {
+      type: Boolean,
+      value: true,
+    },
+
     /** @private */
     showPasswordPromptDialog_: {
       type: Boolean,
@@ -85,9 +94,17 @@ Polymer({
         'smart-lock-signin-enabled-changed',
         this.updateSmartLockSignInEnabled_.bind(this));
 
+    this.addWebUIListener(
+        'smart-lock-signin-allowed-changed',
+        this.updateSmartLockSignInAllowed_.bind(this));
+
     this.browserProxy_.getSmartLockSignInEnabled().then(enabled => {
       this.updateSmartLockSignInEnabled_(enabled);
     });
+
+    this.browserProxy_.getSmartLockSignInAllowed().then(allowed => {
+      this.updateSmartLockSignInAllowed_(allowed);
+    });
   },
 
   /**
@@ -111,6 +128,15 @@ Polymer({
         settings.SignInEnabledState.DISABLED;
   },
 
+  /**
+   * Updates the Smart Lock 'sign-in enabled' toggle such that disallowing
+   * sign-in disables the toggle.
+   * @private
+   */
+  updateSmartLockSignInAllowed_: function(allowed) {
+    this.smartLockSignInAllowed_ = allowed;
+  },
+
   /** @private */
   openPasswordPromptDialog_: function() {
     this.showPasswordPromptDialog_ = true;

chrome/browser/resources/settings/settings_resources.grd

@@ -1367,6 +1367,12 @@
         <structure name="IDR_SETTINGS_MULTIDEVICE_PAGE_JS"
                    file="multidevice_page/multidevice_page.js"
                    type="chrome_html" />
+        <structure name="IDR_SETTINGS_MULTIDEVICE_RADIO_BUTTON_HTML"
+                   file="multidevice_page/multidevice_radio_button.html"
+                   type="chrome_html" />
+        <structure name="IDR_SETTINGS_MULTIDEVICE_RADIO_BUTTON_JS"
+                   file="multidevice_page/multidevice_radio_button.js"
+                   type="chrome_html" />
         <structure name="IDR_SETTINGS_MULTIDEVICE_SMARTLOCK_SUBPAGE_HTML"
                    file="multidevice_page/multidevice_smartlock_subpage.html"
                    type="chrome_html" />

chrome/browser/ui/BUILD.gn

@@ -1721,6 +1721,7 @@ jumbo_split_static_library("ui") {
       "//chromeos/services/assistant/public/mojom",
       "//chromeos/services/assistant/public/proto:proto",
       "//chromeos/services/multidevice_setup/public/cpp:cpp",
+      "//chromeos/services/multidevice_setup/public/cpp:prefs",
       "//chromeos/services/multidevice_setup/public/cpp:url_provider",
       "//chromeos/services/multidevice_setup/public/mojom",
       "//chromeos/strings",

chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc

@@ -16,6 +16,7 @@
 #include "chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h"
 #include "chromeos/components/proximity_auth/logging/logging.h"
 #include "chromeos/components/proximity_auth/proximity_auth_pref_names.h"
+#include "chromeos/services/multidevice_setup/public/cpp/prefs.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_ui.h"
@@ -95,6 +96,10 @@ void MultideviceHandler::RegisterMessages() {
       "setSmartLockSignInEnabled",
       base::BindRepeating(&MultideviceHandler::HandleSetSmartLockSignInEnabled,
                           base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "getSmartLockSignInAllowed",
+      base::BindRepeating(&MultideviceHandler::HandleGetSmartLockSignInAllowed,
+                          base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "getAndroidSmsInfo",
       base::BindRepeating(&MultideviceHandler::HandleGetAndroidSmsInfo,
@@ -244,6 +249,17 @@ void MultideviceHandler::HandleSetSmartLockSignInEnabled(
       proximity_auth::prefs::kProximityAuthIsChromeOSLoginEnabled, enabled);
 }
 
+void MultideviceHandler::HandleGetSmartLockSignInAllowed(
+    const base::ListValue* args) {
+  std::string callback_id;
+  CHECK(args->GetString(0, &callback_id));
+
+  bool sign_in_allowed =
+      prefs_->GetBoolean(multidevice_setup::kSmartLockSigninAllowedPrefName);
+  ResolveJavascriptCallback(base::Value(callback_id),
+                            base::Value(sign_in_allowed));
+}
+
 std::unique_ptr<base::DictionaryValue>
 MultideviceHandler::GenerateAndroidSmsInfo() {
   auto android_sms_info = std::make_unique<base::DictionaryValue>();
@@ -327,6 +343,11 @@ void MultideviceHandler::RegisterPrefChangeListeners() {
       base::BindRepeating(
           &MultideviceHandler::NotifySmartLockSignInEnabledChanged,
           base::Unretained(this)));
+  pref_change_registrar_.Add(
+      multidevice_setup::kSmartLockSigninAllowedPrefName,
+      base::BindRepeating(
+          &MultideviceHandler::NotifySmartLockSignInAllowedChanged,
+          base::Unretained(this)));
 }
 
 void MultideviceHandler::NotifySmartLockSignInEnabledChanged() {
@@ -336,6 +357,13 @@ void MultideviceHandler::NotifySmartLockSignInEnabledChanged() {
                     base::Value(sign_in_enabled));
 }
 
+void MultideviceHandler::NotifySmartLockSignInAllowedChanged() {
+  bool sign_in_allowed =
+      prefs_->GetBoolean(multidevice_setup::kSmartLockSigninAllowedPrefName);
+  FireWebUIListener("smart-lock-signin-allowed-changed",
+                    base::Value(sign_in_allowed));
+}
+
 bool MultideviceHandler::IsAuthTokenValid(const std::string& auth_token) {
   Profile* profile = Profile::FromWebUI(web_ui());
   quick_unlock::QuickUnlockStorage* quick_unlock_storage =

chrome/browser/ui/webui/settings/chromeos/multidevice_handler.h

@@ -69,6 +69,7 @@ class MultideviceHandler
   void HandleSetUpAndroidSms(const base::ListValue* args);
   void HandleGetSmartLockSignInEnabled(const base::ListValue* args);
   void HandleSetSmartLockSignInEnabled(const base::ListValue* args);
+  void HandleGetSmartLockSignInAllowed(const base::ListValue* args);
   void HandleGetAndroidSmsInfo(const base::ListValue* args);
 
   void OnSetFeatureStateEnabledResult(const std::string& js_callback_id,
@@ -76,6 +77,7 @@ class MultideviceHandler
 
   void RegisterPrefChangeListeners();
   void NotifySmartLockSignInEnabledChanged();
+  void NotifySmartLockSignInAllowedChanged();
   // Generate android sms info dictionary containing the messages for web
   // content settings origin url and messages feature state.
   std::unique_ptr<base::DictionaryValue> GenerateAndroidSmsInfo();