Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / options / controlled_setting.js

diff --git a/src/chrome/browser/resources/options/controlled_setting.js b/src/chrome/browser/resources/options/controlled_setting.js
index df428fa..fdaa294 100644 (file)
--- a/src/chrome/browser/resources/options/controlled_setting.js
+++ b/src/chrome/browser/resources/options/controlled_setting.js
@@ -55,6 +55,12 @@ cr.define('options', function() {
      * Handle changes to the associated pref by hiding any currently visible
      * bubble and updating the controlledBy property.
      * @param {Event} event Pref change event.
+     * @suppress {checkTypes}
+     * TODO(vitalyp): remove the suppression. |controlledBy| property is defined
+     * by cr.defineProperty(). Currently null can't be assigned to such
+     * properties due to implementation of ChromePass.java. See this discussion
+     * to change nulls to empty string below:
+     * https://chromiumcodereview.appspot.com/11066015/
      */
     handlePrefChange: function(event) {
       PageManager.hideBubble();
@@ -139,8 +145,7 @@ cr.define('options', function() {
         if (this.controlledBy == 'hasRecommendation' && this.resetHandler_ &&
             !this.readOnly) {
           var container = document.createElement('div');
-          var action = document.createElement('button');
-          action.classList.add('link-button');
+          var action = new ActionLink;
           action.classList.add('controlled-setting-bubble-action');
           action.textContent =
               loadTimeData.getString('controlledSettingFollowRecommendation');