Upstream version 7.35.139.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 d2436b7..5ac42d9 100644 (file)
--- a/src/chrome/browser/resources/options/controlled_setting.js
+++ b/src/chrome/browser/resources/options/controlled_setting.js
@@ -61,19 +61,9 @@ cr.define('options', function() {
         if (!this.value || String(event.value.value) == this.value) {
           this.controlledBy = event.value.controlledBy;
           if (event.value.extension) {
-            if (this.pref == 'session.restore_on_startup' ||
-                this.pref == 'homepage_is_newtabpage') {
-              // Special case for the restore on startup, which is implied
-              // by the startup pages settings being controlled by an
-              // extension, and same for the home page as NTP, so we don't want
-              // to show two buttons in these cases.
-              // TODO(mad): Find a better way to handle this.
-              this.controlledBy = null;
-            } else {
-              this.extensionId = event.value.extension.id;
-              this.extensionIcon = event.value.extension.icon;
-              this.extensionName = event.value.extension.name;
-            }
+            this.extensionId = event.value.extension.id;
+            this.extensionIcon = event.value.extension.icon;
+            this.extensionName = event.value.extension.name;
           }
         } else {
           this.controlledBy = null;
@@ -181,7 +171,8 @@ cr.define('options', function() {
                                          path: '?id=' + extensionId});
           };
 
-          var disableButton = extensionContainer.querySelector('button');
+          var disableButton = extensionContainer.querySelector(
+              '.controlled-setting-bubble-extension-disable-button');
           disableButton.onclick = function() {
             chrome.send('disableExtension', [extensionId]);
           };