2 files changed, 19 insertions, 1 deletions

diff --git a/chrome/browser/resources/options2/browser_options.css b/chrome/browser/resources/options2/browser_options.css
index bf46539..3c64ba5 100644
--- a/chrome/browser/resources/options2/browser_options.css
+++ b/chrome/browser/resources/options2/browser_options.css
@@ -127,7 +127,7 @@ input[type='range'] {
   -webkit-box-orient: horizontal;
   display: -webkit-box;
   height: 42px;
-  vertical-align: baseline;
+  vertical-align: middle;
 }
 
 list:not([disabled]) > .network-group:hover,
@@ -139,6 +139,7 @@ list:not([disabled]) > .network-group[selected] {
 }
 
 .network-group-labels {
+  -webkit-box-flex: 1;
   -webkit-box-orient: vertical;
   display: -webkit-box;
   padding-top: 3px;
@@ -218,6 +219,7 @@ list:not([disabled]) > .network-group[selected] {
   width: 19px;
 }
 
+.network-group > .controlled-setting-indicator,
 .network-menu-item > .controlled-setting-indicator {
   -webkit-box-flex: 0;
   -webkit-margin-end: 5px;
@@ -227,6 +229,10 @@ list:not([disabled]) > .network-group[selected] {
   width: 16px;
 }
 
+.network-group > .controlled-setting-indicator {
+  margin-top: 0;
+}
+
 .network-options-button:hover {
   /* TODO(kevers): Update once proper assets received for the options
      button. */
diff --git a/chrome/browser/resources/options2/chromeos/network_list.js b/chrome/browser/resources/options2/chromeos/network_list.js
index 6647983..0f71139 100644
--- a/chrome/browser/resources/options2/chromeos/network_list.js
+++ b/chrome/browser/resources/options2/chromeos/network_list.js
@@ -205,6 +205,13 @@ cr.define('options.network', function() {
       this.subtitle_.classList.add('network-selector');
     },
 
+    /**
+     * Adds an indicator to show that the network is policy managed.
+     */
+    showManagedNetworkIndicator: function() {
+      this.appendChild(new ManagedNetworkIndicator());
+    },
+
     /* @inheritDoc */
     decorate: function() {
       ListItem.prototype.decorate.call(this);
@@ -345,6 +352,7 @@ cr.define('options.network', function() {
     /* @inheritDoc */
     decorate: function() {
       // TODO(kevers): Generalize method of setting default label.
+      var policyManaged = false;
       var defaultMessage = this.data_.key == 'wifi' ?
           'networkOffline' : 'networkNotConnected';
       this.subtitle = templateData[defaultMessage];
@@ -354,6 +362,7 @@ cr.define('options.network', function() {
         var networkDetails = list[i];
         if (networkDetails.connecting || networkDetails.connected) {
           this.subtitle = networkDetails.networkName;
+          policyManaged = networkDetails.policyManaged;
           candidateURL = networkDetails.iconURL;
           // Only break when we see a connecting network as it is possible to
           // have a connected network and a connecting network at the same
@@ -372,6 +381,9 @@ cr.define('options.network', function() {
 
       this.showSelector();
 
+      if (policyManaged)
+        this.showManagedNetworkIndicator();
+
       // TODO(kevers): Add default icon for VPN when disconnected or in the
       // process of connecting.