[options2] Fix issue when deleting a user and pressing back.

chrome/browser/resources/options2/manage_profile_overlay.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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
    * ManageProfileOverlay class
@@ skipping 67 matching lines @@
         var name = $('create-profile-name').value;
         var icon_url = createIconGrid.selectedItem;
         chrome.send('createProfile', [name, icon_url]);
       };
     },
 
     /** @inheritDoc */
     didShowPage: function() {
       chrome.send('requestDefaultProfileIcons');
 
-      // Use the hash to specify the profile index. Note: the actual index
-      // is ignored. Only the current profile may be edited.
-      if (window.location.hash.length > 1)
+      // didShowPage happens when a page is visited via explicit user action
+      // (e.g. a user clicks "Add User" or "Edit User") or when going back or
+      // forward in history. If the user goes back to a #create page, generate a
+      // new profile info suggestion. Additionally, #edit is assumed as the
+      // default case for anything other than #create with a path of
+      // /manageProfile (as delete explicitly doesn't change the path nor
+      // generate any history events).
+      if (window.location.hash == '#create')
+        ManageProfileOverlay.getInstance().prepareForCreateDialog_();
+      else if (window.location.pathname == '/manageProfile')
         ManageProfileOverlay.getInstance().prepareForManageDialog_();
-
-      $('manage-profile-name').focus();
-      $('create-profile-name').focus();
     },
 
     /**
      * Set the profile info used in the dialog.
      * @param {Object} profileInfo An object of the form:
      *     profileInfo = {
      *       name: "Profile Name",
      *       iconURL: "chrome://path/to/icon/image",
      *       filePath: "/path/to/profile/data/on/disk"
      *       isCurrentProfile: false,
@@ skipping 121 matching lines @@
     onIconGridSelectionChanged_: function(mode) {
       var iconURL = $(mode + '-profile-icon-grid').selectedItem;
       if (!iconURL || iconURL == this.iconGridSelectedURL_)
         return;
       this.iconGridSelectedURL_ = iconURL;
       chrome.send('profileIconSelectionChanged',
                   [this.profileInfo_.filePath, iconURL]);
     },
 
     /**
-     * Updates the contents of the "Manage Profile" section of the dialog,
+     * Updates the contents of the "Manage Profile" section of the dialog
      * and shows that section.
      * @private
      */
     prepareForManageDialog_: function() {
       var profileInfo = BrowserOptions.getCurrentProfile();
       ManageProfileOverlay.setProfileInfo(profileInfo, 'manage');
-      $('manage-profile-overlay-create').hidden = true;
-      $('manage-profile-overlay-manage').hidden = false;
-      $('manage-profile-overlay-delete').hidden = true;
+      this.hideAllDialogSections_($('manage-profile-overlay-manage'));
       this.hideErrorBubble_('manage');
+      $('manage-profile-name').focus();
     },
 
     /**
      * Display the "Manage Profile" dialog.
      * @private
      */
     showManageDialog_: function() {
       this.prepareForManageDialog_();
-      OptionsPage.navigateToPage('manageProfile');
+      OptionsPage.showPageByName('manageProfile', true, {hash: '#edit'});
     },
 
     /**
+     * Hides all dialog sections.
+     * @param {Element=} opt_exceptDialog An optional dialog to show.
+     * @private
+     */
+    hideAllDialogSections_: function(opt_exceptDialog) {
+      ['manage-profile-overlay-create',
+       'manage-profile-overlay-manage',
+       'manage-profile-overlay-delete'].forEach(function(id) {
+        var section = getRequiredElement(id);
+        section.hidden = opt_exceptDialog != section;
+      });
+    },
+
+    /**
      * Display the "Delete Profile" dialog.
      * @param {Object} profileInfo The profile object of the profile to delete.
      * @private
      */
     showDeleteDialog_: function(profileInfo) {
       ManageProfileOverlay.setProfileInfo(profileInfo, 'manage');
-      $('manage-profile-overlay-create').hidden = true;
-      $('manage-profile-overlay-manage').hidden = true;
-      $('manage-profile-overlay-delete').hidden = false;
+      this.hideAllDialogSections_($('manage-profile-overlay-delete'));
       $('delete-profile-message').textContent =
           loadTimeData.getStringF('deleteProfileMessage', profileInfo.name);
       $('delete-profile-message').style.backgroundImage = 'url("' +
           profileInfo.iconURL + '")';
 
       // Because this dialog isn't useful when refreshing or as part of the
       // history, don't create a history entry for it when showing.
       OptionsPage.showPageByName('manageProfile', false);
     },
 
     /**
+     * Readies the manage profile overlay to show create section of the dialog.
+     * @private
+     */
+    prepareForCreateDialog_: function() {
+      chrome.send('createProfileInfo');
+      this.hideAllDialogSections_($('manage-profile-overlay-create'));
+      $('create-profile-instructions').textContent =
+         loadTimeData.getStringF('createProfileInstructions');
+      ManageProfileOverlay.getInstance().hideErrorBubble_('create');
+      $('create-profile-name').focus();
+    },
+
+    /**
      * Display the "Create Profile" dialog.
      * @param {Object} profileInfo The profile object of the profile to
      *     create. Upon creation, this object only needs a name and an avatar.
      * @private
      */
-    showCreateDialog_: function(profileInfo) {
-      ManageProfileOverlay.setProfileInfo(profileInfo, 'create');
-      $('manage-profile-overlay-create').hidden = false;
-      $('manage-profile-overlay-manage').hidden = true;
-      $('manage-profile-overlay-delete').hidden = true;
-      $('create-profile-instructions').textContent =
-         loadTimeData.getStringF('createProfileInstructions');
-      ManageProfileOverlay.getInstance().hideErrorBubble_('create');
-
-      OptionsPage.navigateToPage('manageProfile');
+    showCreateDialog_: function() {
+      this.prepareForCreateDialog_();
+      OptionsPage.showPageByName('manageProfile', true, {hash: '#create'});
     },
-
   };
 
   // Forward public APIs to private implementations.
   [
     'receiveDefaultProfileIcons',
     'receiveProfileNames',
     'setProfileInfo',
     'setProfileName',
     'showManageDialog',
     'showDeleteDialog',
     'showCreateDialog',
   ].forEach(function(name) {
     ManageProfileOverlay[name] = function() {
       var instance = ManageProfileOverlay.getInstance();
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ManageProfileOverlay: ManageProfileOverlay
   };
 });