[uber page] Merge advanced options page into browser options.

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;
 var BrowserOptions = options.BrowserOptions;
 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
 var ContentSettings = options.ContentSettings;
 var ContentSettingsExceptionsArea =
     options.contentSettings.ContentSettingsExceptionsArea;
 var CookiesView = options.CookiesView;
@@ skipping 42 matching lines @@
   // 12519. Instead, we add a class.
   if (menuDisabled)
     document.documentElement.classList.add('hide-menu');
 
   localStrings = new LocalStrings();
 
   // Top level pages.
   OptionsPage.register(SearchPage.getInstance());
   OptionsPage.register(BrowserOptions.getInstance());
 
-  // BrowserOptions sub-page.
-  OptionsPage.registerSubPage(AdvancedOptions.getInstance(),
-                              BrowserOptions.getInstance(),
-                              [$('advanced-settings')]);
-
   // Overlays.
   OptionsPage.registerOverlay(AddLanguageOverlay.getInstance(),
                               LanguageOptions.getInstance());
   OptionsPage.registerOverlay(AlertOverlay.getInstance());
   OptionsPage.registerOverlay(AutofillEditAddressOverlay.getInstance(),
                               AutofillOptions.getInstance());
   OptionsPage.registerOverlay(AutofillEditCreditCardOverlay.getInstance(),
                               AutofillOptions.getInstance());
   OptionsPage.registerOverlay(AutofillOptions.getInstance(),
-                              AdvancedOptions.getInstance(),
+                              BrowserOptions.getInstance(),
                               [$('autofill-settings')]);
   OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance(),
-                              AdvancedOptions.getInstance(),
+                              BrowserOptions.getInstance(),
                               [$('privacyClearDataButton')]);
   OptionsPage.registerOverlay(ContentSettings.getInstance(),
-                              AdvancedOptions.getInstance(),
+                              BrowserOptions.getInstance(),
                               [$('privacyContentSettingsButton')]);
   OptionsPage.registerOverlay(ContentSettingsExceptionsArea.getInstance(),
                               ContentSettings.getInstance());
   OptionsPage.registerOverlay(CookiesView.getInstance(),
                               ContentSettings.getInstance(),
                               [$('privacyContentSettingsButton'),
                                $('show-cookies-button')]);
   OptionsPage.registerOverlay(FontSettings.getInstance(),
-                              AdvancedOptions.getInstance(),
+                              BrowserOptions.getInstance(),
                               [$('fontSettingsCustomizeFontsButton')]);
   if (HandlerOptions && $('manage-handlers-button')) {
     OptionsPage.registerOverlay(HandlerOptions.getInstance(),
                                 ContentSettings.getInstance(),
                                 [$('manage-handlers-button')]);
   }
   OptionsPage.registerOverlay(HomePageOverlay.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('home-page-select')]);
   OptionsPage.registerOverlay(ImportDataOverlay.getInstance(),
                               BrowserOptions.getInstance());
   OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(),
                               BrowserOptions.getInstance());
   OptionsPage.registerOverlay(LanguageOptions.getInstance(),
-                              AdvancedOptions.getInstance(),
+                              BrowserOptions.getInstance(),
                               [$('language-button')]);
   OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),
                               BrowserOptions.getInstance());
   OptionsPage.registerOverlay(PasswordManager.getInstance(),
-                              AdvancedOptions.getInstance(),
+                              BrowserOptions.getInstance(),
                               [$('manage-passwords')]);
   OptionsPage.registerOverlay(SearchEngineManager.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('manage-default-search-engines')]);
   OptionsPage.registerOverlay(SessionRestoreOverlay.getInstance(),
                               BrowserOptions.getInstance());
   OptionsPage.registerOverlay(StartupOverlay.getInstance(),
                               BrowserOptions.getInstance());
   OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(),
                               BrowserOptions.getInstance());
   if (cr.isChromeOS) {
     OptionsPage.registerOverlay(AccountsOptions.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('manage-accounts-button')]);
     OptionsPage.registerOverlay(BluetoothOptions.getInstance(),
-                                AdvancedOptions.getInstance(),
+                                BrowserOptions.getInstance(),
                                 [$('bluetooth-add-device')]);
     OptionsPage.registerOverlay(BluetoothPairing.getInstance(),
-                                AdvancedOptions.getInstance());
+                                BrowserOptions.getInstance());
     OptionsPage.registerOverlay(ChangePictureOptions.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('account-picture')]);
     OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),
                                 InternetOptions.getInstance());
     OptionsPage.registerOverlay(InternetOptions.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('internet-options-button')]);
     OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),
                                 BrowserOptions.getInstance(),
@@ skipping 32 matching lines @@
     }
   }
   if (!cr.isWindows && !cr.isMac) {
     OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
                                 CertificateManager.getInstance());
     OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
                                 CertificateManager.getInstance());
     OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(),
                                 CertificateManager.getInstance());
     OptionsPage.registerOverlay(CertificateManager.getInstance(),
-                                AdvancedOptions.getInstance(),
+                                BrowserOptions.getInstance(),
                                 [$('certificatesManageButton')]);
     OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance(),
                                 CertificateManager.getInstance());
   }
 
   Preferences.getInstance().initialize();
   OptionsPage.initialize();
 
   var path = document.location.pathname;
 
@@ skipping 37 matching lines @@
   options.OptionsPage.willClose();
 };
 
 /**
  * Listener for the |popstate| event.
  * @param {Event} e The |popstate| event.
  */
 window.onpopstate = function(e) {
   options.OptionsPage.setState(e.state);
 };