1 files changed, 41 insertions, 27 deletions
diff --git a/chrome/browser/resources/options/chromeos_system_options.js b/chrome/browser/resources/options/chromeos_system_options.js
index cfabc86..cef3507 100644
--- a/chrome/browser/resources/options/chromeos_system_options.js
+++ b/chrome/browser/resources/options/chromeos_system_options.js
@@ -2,36 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-///////////////////////////////////////////////////////////////////////////////
-// SystemOptions class:
+cr.define('options', function() {
 
-/**
- * Encapsulated handling of ChromeOS system options page.
- * @constructor
- */
-function SystemOptions() {
-  OptionsPage.call(this, 'system', templateData.systemPage, 'systemPage');
-}
-
-cr.addSingletonGetter(SystemOptions);
-
-// Inherit SystemOptions from OptionsPage.
-SystemOptions.prototype = {
-  __proto__: OptionsPage.prototype,
+  var OptionsPage = options.OptionsPage;
+  /////////////////////////////////////////////////////////////////////////////
+  // SystemOptions class:
 
   /**
-   * Initializes SystemOptions page.
-   * Calls base class implementation to starts preference initialization.
+   * Encapsulated handling of ChromeOS system options page.
+   * @constructor
    */
-  initializePage: function() {
-    OptionsPage.prototype.initializePage.call(this);
-    var timezone = $('timezone-select');
-    if (timezone) {
-      timezone.initializeValues(templateData.timezoneList);
-    }
 
-    $('language-button').onclick = function(event) {
-      OptionsPage.showPageByName('language');
-    };
+  function SystemOptions() {
+    OptionsPage.call(this, 'system', templateData.systemPage, 'systemPage');
   }
-};
+
+  cr.addSingletonGetter(SystemOptions);
+
+  // Inherit SystemOptions from OptionsPage.
+  SystemOptions.prototype = {
+    __proto__: options.OptionsPage.prototype,
+
+    /**
+     * Initializes SystemOptions page.
+     * Calls base class implementation to starts preference initialization.
+     */
+    initializePage: function() {
+      OptionsPage.prototype.initializePage.call(this);
+      var timezone = $('timezone-select');
+      if (timezone) {
+        timezone.initializeValues(templateData.timezoneList);
+      }
+
+      $('language-button').onclick = function(event) {
+        OptionsPage.showPageByName('language');
+      };
+      $('modifier-keys-button').onclick = function(event) {
+        OptionsPage.showOverlay('languageCustomizeModifierKeysOverlay');
+      };
+    }
+  };
+
+  // Export
+  return {
+    SystemOptions: SystemOptions
+  };
+
+});