BASELINE: Update Chromium to 57.0.2987.144

Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

5 files changed, 61 insertions, 21 deletions

diff --git a/chromium/chrome/browser/resources/extensions/extension_command_list.js b/chromium/chrome/browser/resources/extensions/extension_command_list.js
index fd91fc0c9f8..eca1797c75b 100644
--- a/chromium/chrome/browser/resources/extensions/extension_command_list.js
+++ b/chromium/chrome/browser/resources/extensions/extension_command_list.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-<include src="shortcut_util.js">
+// <include src="shortcut_util.js">
 
 cr.define('extensions', function() {
   'use strict';
diff --git a/chromium/chrome/browser/resources/extensions/extension_commands_overlay.js b/chromium/chrome/browser/resources/extensions/extension_commands_overlay.js
index 24307e026e8..443440b2856 100644
--- a/chromium/chrome/browser/resources/extensions/extension_commands_overlay.js
+++ b/chromium/chrome/browser/resources/extensions/extension_commands_overlay.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-<include src="extension_command_list.js">
+// <include src="extension_command_list.js">
 
 cr.define('extensions', function() {
   'use strict';
diff --git a/chromium/chrome/browser/resources/extensions/extension_list.js b/chromium/chrome/browser/resources/extensions/extension_list.js
index a73b70a7a00..610515a2905 100644
--- a/chromium/chrome/browser/resources/extensions/extension_list.js
+++ b/chromium/chrome/browser/resources/extensions/extension_list.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-<include src="extension_error.js">
+// <include src="extension_error.js">
 
 cr.define('extensions', function() {
   'use strict';
diff --git a/chromium/chrome/browser/resources/extensions/extensions.html b/chromium/chrome/browser/resources/extensions/extensions.html
index 39ab5fa223e..0f4be9a3d1e 100644
--- a/chromium/chrome/browser/resources/extensions/extensions.html
+++ b/chromium/chrome/browser/resources/extensions/extensions.html
@@ -77,6 +77,8 @@
         <label>
           <input id="toggle-dev-on" type="checkbox">
           <span>$i18n{extensionSettingsDeveloperMode}</span>
+          <span id="dev-toggle-disabled-by-policy-indicator"
+              class="controlled-setting-indicator"></span>
         </label>
       </div>
     </div>
diff --git a/chromium/chrome/browser/resources/extensions/extensions.js b/chromium/chrome/browser/resources/extensions/extensions.js
index fbf7b3cb2a4..627e2299618 100644
--- a/chromium/chrome/browser/resources/extensions/extensions.js
+++ b/chromium/chrome/browser/resources/extensions/extensions.js
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-<include src="../../../../ui/webui/resources/js/cr/ui/focus_row.js">
-<include src="../../../../ui/webui/resources/js/cr/ui/focus_grid.js">
-<include src="../uber/uber_utils.js">
-<include src="drag_and_drop_handler.js">
-<include src="extension_code.js">
-<include src="extension_commands_overlay.js">
-<include src="extension_error_overlay.js">
-<include src="extension_focus_manager.js">
-<include src="focus_row.js">
-<include src="extension_list.js">
-<include src="pack_extension_overlay.js">
-<include src="extension_loader.js">
-<include src="extension_options_overlay.js">
-
-<if expr="chromeos">
-<include src="chromeos/kiosk_apps.js">
-</if>
+// <include src="../../../../ui/webui/resources/js/cr/ui/focus_row.js">
+// <include src="../../../../ui/webui/resources/js/cr/ui/focus_grid.js">
+// <include src="../uber/uber_utils.js">
+// <include src="drag_and_drop_handler.js">
+// <include src="extension_code.js">
+// <include src="extension_commands_overlay.js">
+// <include src="extension_error_overlay.js">
+// <include src="extension_focus_manager.js">
+// <include src="focus_row.js">
+// <include src="extension_list.js">
+// <include src="pack_extension_overlay.js">
+// <include src="extension_loader.js">
+// <include src="extension_options_overlay.js">
+
+// <if expr="chromeos">
+// <include src="chromeos/kiosk_apps.js">
+// </if>
 
 // Used for observing function of the backend datasource for this page by
 // tests.
@@ -196,6 +196,8 @@ cr.define('extensions', function() {
 
       /** @const */
       var supervised = profileInfo.isSupervised;
+      var developerModeControlledByPolicy =
+          profileInfo.isDeveloperModeControlledByPolicy;
 
       var pageDiv = $('extension-settings');
       pageDiv.classList.toggle('profile-is-supervised', supervised);
@@ -203,7 +205,13 @@ cr.define('extensions', function() {
 
       var devControlsCheckbox = $('toggle-dev-on');
       devControlsCheckbox.checked = profileInfo.inDeveloperMode;
-      devControlsCheckbox.disabled = supervised;
+      devControlsCheckbox.disabled =
+          supervised || developerModeControlledByPolicy;
+
+      // This is necessary e.g. if developer mode is now disabled by policy
+      // but extension developer tools were visible.
+      this.updateDevControlsVisibility_(false);
+      this.updateDevToggleControlledIndicator_(developerModeControlledByPolicy);
 
       $('load-unpacked').disabled = !profileInfo.canLoadUnpacked;
       var extensionList = $('extension-settings-list');
@@ -219,6 +227,36 @@ cr.define('extensions', function() {
     },
 
     /**
+     * Shows or hides the 'controlled by policy' indicator on the dev-toggle
+     * checkbox.
+     * @param {boolean} devModeControlledByPolicy true if the indicator
+     *     should be showing.
+     * @private
+     */
+    updateDevToggleControlledIndicator_: function(devModeControlledByPolicy) {
+      var controlledIndicator = document.querySelector(
+          '#dev-toggle .controlled-setting-indicator');
+
+      if (!(controlledIndicator instanceof cr.ui.ControlledIndicator))
+        cr.ui.ControlledIndicator.decorate(controlledIndicator);
+
+      // We control the visibility of the ControlledIndicator by setting or
+      // removing the 'controlled-by' attribute (see controlled_indicator.css).
+      var isVisible = controlledIndicator.getAttribute('controlled-by');
+      if (devModeControlledByPolicy && !isVisible) {
+        var controlledBy = 'policy';
+        controlledIndicator.setAttribute(
+           'controlled-by', controlledBy);
+        controlledIndicator.setAttribute(
+            'text' + controlledBy,
+            loadTimeData.getString('extensionControlledSettingPolicy'));
+      } else if (!devModeControlledByPolicy && isVisible) {
+        // This hides the element - see above.
+        controlledIndicator.removeAttribute('controlled-by');
+      }
+    },
+
+    /**
      * Shows the loading spinner and hides elements that shouldn't be visible
      * while loading.
      * @param {boolean} isLoading