[uber page] Migrate all elements in the 'System' (cros) page to new locations.

chrome/browser/resources/options2/options.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var AddLanguageOverlay = options.AddLanguageOverlay;
 var AdvancedOptions = options.AdvancedOptions;
 var AlertOverlay = options.AlertOverlay;
 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
 var AutofillOptions = options.AutofillOptions;
@@ skipping 54 matching lines @@
   OptionsPage.register(SearchPage.getInstance());
 
   OptionsPage.register(BrowserOptions.getInstance());
   OptionsPage.registerSubPage(SearchEngineManager.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('defaultSearchManageEnginesButton')]);
   OptionsPage.registerSubPage(AdvancedOptions.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('advancedOptionsButton')]);
   if (cr.isChromeOS) {
-    OptionsPage.register(SystemOptions.getInstance());
     OptionsPage.registerSubPage(LanguageOptions.getInstance(),
-                                SystemOptions.getInstance(),
+                                AdvancedOptions.getInstance(),
                                 [$('language-button')]);
     OptionsPage.registerSubPage(
         new OptionsPage('languageChewing',
                         templateData.languageChewingPageTabTitle,
                         'languageChewingPage'),
         LanguageOptions.getInstance());
     OptionsPage.registerSubPage(
         new OptionsPage('languageHangul',
                         templateData.languageHangulPageTabTitle,
                         'languageHangulPage'),
@@ skipping 91 matching lines @@
   if (cr.isChromeOS) {
     OptionsPage.register(AccountsOptions.getInstance());
     OptionsPage.registerSubPage(ProxyOptions.getInstance(),
                                 InternetOptions.getInstance());
     OptionsPage.registerSubPage(ChangePictureOptions.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('change-picture-button')]);
     OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),
                                 InternetOptions.getInstance());
     OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),
-                                SystemOptions.getInstance(),
-                                [$('modifier-keys-button')]);
+                                BrowserOptions.getInstance(),
+                                [$('keyboard-settings-button')]);
     OptionsPage.registerOverlay(PointerOverlay.getInstance(),
-                                SystemOptions.getInstance());
+                                BrowserOptions.getInstance(),
+                                [$('pointer-settings-button')]);
     OptionsPage.registerOverlay(BluetoothOptions.getInstance(),
-                                SystemOptions.getInstance(),
+                                AdvancedOptions.getInstance(),
                                 [$('bluetooth-add-device')]);
     OptionsPage.registerOverlay(BluetoothPairing.getInstance(),
-                                SystemOptions.getInstance());
+                                AdvancedOptions.getInstance());
   }
 
   Preferences.getInstance().initialize();
   OptionsPage.initialize();
 
   var path = document.location.pathname;
 
   if (path.length > 1) {
     // Skip starting slash and remove trailing slash (if any).
     var pageName = path.slice(1).replace(/\/$/, '');
@@ skipping 22 matching lines @@
 
 document.addEventListener('DOMContentLoaded', load);
 
 window.onbeforeunload = function() {
   options.OptionsPage.willClose();
 };
 
 window.onpopstate = function(e) {
   options.OptionsPage.setState(e.state);
 };