[uber page] Migrate the change picture sub-page to a dialog

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 57 matching lines @@
   OptionsPage.register(BrowserOptions.getInstance());
 
   // BrowserOptions sub-pages.
   OptionsPage.registerSubPage(AdvancedOptions.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('advanced-settings')]);
   if (cr.isChromeOS) {
     OptionsPage.registerSubPage(AccountsOptions.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('manage-accounts-button')]);
-    OptionsPage.registerSubPage(ChangePictureOptions.getInstance(),
-                                BrowserOptions.getInstance(),
-                                [$('change-picture-button')]);
     OptionsPage.registerSubPage(InternetOptions.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('internet-options-button')]);
   }
 
   // AdvancedOptions sub-pages.
   OptionsPage.registerSubPage(ContentSettings.getInstance(),
                               AdvancedOptions.getInstance(),
                               [$('privacyContentSettingsButton')]);
 
@@ skipping 92 matching lines @@
   OptionsPage.registerOverlay(StartupOverlay.getInstance(),
                               BrowserOptions.getInstance());
   OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(),
                               BrowserOptions.getInstance());
   if (cr.isChromeOS) {
     OptionsPage.registerOverlay(BluetoothOptions.getInstance(),
                                 AdvancedOptions.getInstance(),
                                 [$('bluetooth-add-device')]);
     OptionsPage.registerOverlay(BluetoothPairing.getInstance(),
                                 AdvancedOptions.getInstance());
+    OptionsPage.registerOverlay(ChangePictureOptions.getInstance(),
+                                BrowserOptions.getInstance(),
+                                [$('change-picture-button')]);
     OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),
                                 InternetOptions.getInstance());
     OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('keyboard-settings-button')]);
     OptionsPage.registerOverlay(PointerOverlay.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('pointer-settings-button')]);
     OptionsPage.registerOverlay(ProxyOptions.getInstance(),
                                 InternetOptions.getInstance());
@@ skipping 57 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);
 };