1 files changed, 8 insertions, 15 deletions
diff --git a/chrome/browser/resources/options/pref_ui.js b/chrome/browser/resources/options/pref_ui.js
index 6fcfd89..19b101c 100644
--- a/chrome/browser/resources/options/pref_ui.js
+++ b/chrome/browser/resources/options/pref_ui.js
@@ -22,6 +22,8 @@ cr.define('options', function() {
       this.type = 'checkbox';
       var self = this;
 
+      self.initializeValueType(self.getAttribute('value-type'));
+
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
@@ -57,12 +59,6 @@ cr.define('options', function() {
                 break;
             }
           });
-
-      // Initialize options.
-      this.ownerDocument.addEventListener('DOMContentLoaded',
-          function() {
-            self.initializeValueType(self.getAttribute('value-type'));
-          });
     },
 
     /**
@@ -286,6 +282,12 @@ cr.define('options', function() {
     */
     decorate: function() {
       var self = this;
+
+      var values = self.getAttribute('data-values');
+      if (values) {
+        self.initializeValues(templateData[values]);
+      }
+
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
@@ -327,15 +329,6 @@ cr.define('options', function() {
                 break;
             }
           });
-
-      // Initialize options.
-      this.ownerDocument.addEventListener('DOMContentLoaded',
-          function() {
-            var values = self.getAttribute('data-values');
-            if (values) {
-              self.initializeValues(templateData[values]);
-            }
-          });
     },
 
     /**