Show kite icon and parent tooltip in Site Settings for child users

Site Settings page currently shows the enterprise "office" icon
instead of the "kite" icon for supervised users. This CL fixes this
and ensures that the kite icon and "This setting is managed by a
parent." tooltip is shown in Site Settings when a supervised user
is logged in.

Bug: 1005547
Change-Id: I91d81337b3f1b5cd070163ecc032a1695592dc0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838652
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705205}

chrome/browser/resources/settings/site_settings/category_default_setting.js

@@ -177,10 +177,22 @@ Polymer({
     if (update.source !== undefined &&
         update.source != ContentSettingProvider.PREFERENCE) {
       basePref.enforcement = chrome.settingsPrivate.Enforcement.ENFORCED;
-      basePref.controlledBy =
-          update.source == ContentSettingProvider.EXTENSION ?
-          chrome.settingsPrivate.ControlledBy.EXTENSION :
-          chrome.settingsPrivate.ControlledBy.USER_POLICY;
+      switch (update.source) {
+        case ContentSettingProvider.POLICY:
+          basePref.controlledBy =
+              chrome.settingsPrivate.ControlledBy.DEVICE_POLICY;
+          break;
+        case ContentSettingProvider.SUPERVISED_USER:
+          basePref.controlledBy = chrome.settingsPrivate.ControlledBy.PARENT;
+          break;
+        case ContentSettingProvider.EXTENSION:
+          basePref.controlledBy = chrome.settingsPrivate.ControlledBy.EXTENSION;
+          break;
+        default:
+          basePref.controlledBy =
+              chrome.settingsPrivate.ControlledBy.USER_POLICY;
+          break;
+      }
     }
 
     const prefValue = this.computeIsSettingEnabled(update.setting);

chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js

@@ -14,8 +14,16 @@
  * @enum {string}
  */
 const ContentSettingProvider = {
+  POLICY: 'policy',
+  SUPERVISED_USER: 'supervised_user',
   EXTENSION: 'extension',
+  INSTALLED_WEBAPP_PROVIDER: 'installed_webapp_provider',
+  NOTIFICATION_ANDROID: 'notification_android',
+  EPHEMERAL: 'ephemeral',
   PREFERENCE: 'preference',
+  DEFAULT: 'default',
+  TESTS: 'tests',
+  TESTS_OTHER: 'tests_other'
 };
 
 /**

chrome/test/data/webui/cr_elements/cr_policy_indicator_behavior_tests.js

@@ -35,6 +35,28 @@ suite('CrPolicyIndicatorBehavior', function() {
             indicator.indicatorType, indicator.indicatorSourceName));
   });
 
+  test('parent-controlled indicator', function() {
+    indicator.indicatorType = CrPolicyIndicatorType.PARENT;
+
+    assertTrue(indicator.indicatorVisible);
+    assertEquals('cr20:kite', indicator.indicatorIcon);
+    assertEquals(
+        'parent',
+        indicator.getIndicatorTooltip(
+            indicator.indicatorType, indicator.indicatorSourceName));
+  });
+
+  test('child-restriction indicator', function() {
+    indicator.indicatorType = CrPolicyIndicatorType.CHILD_RESTRICTION;
+
+    assertTrue(indicator.indicatorVisible);
+    assertEquals('cr20:kite', indicator.indicatorIcon);
+    assertEquals(
+        'Restricted for child',
+        indicator.getIndicatorTooltip(
+            indicator.indicatorType, indicator.indicatorSourceName));
+  });
+
   test('recommended indicator', function() {
     indicator.indicatorType = CrPolicyIndicatorType.RECOMMENDED;
 

chrome/test/data/webui/cr_elements/cr_policy_indicator_tests.js

@@ -40,5 +40,17 @@ suite('CrPolicyIndicator', function() {
       assertEquals('cr:person', icon.iconClass);
       assertEquals('owner: foo@example.com', icon.tooltipText);
     }
+
+    indicator.indicatorType = CrPolicyIndicatorType.PARENT;
+
+    assertFalse(icon.hidden);
+    assertEquals('cr20:kite', icon.iconClass);
+    assertEquals('parent', icon.tooltipText);
+
+    indicator.indicatorType = CrPolicyIndicatorType.CHILD_RESTRICTION;
+
+    assertFalse(icon.hidden);
+    assertEquals('cr20:kite', icon.iconClass);
+    assertEquals('Restricted for child', icon.tooltipText);
   });
 });