Merge 143541 - Fix edit profile link in NTP

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 48 matching lines @@
       $('delete-profile-ok').onclick = function(event) {
         OptionsPage.closeOverlay();
         chrome.send('deleteProfile', [self.profileInfo_.filePath]);
       };
     },
 
     /** @inheritDoc */
     didShowPage: function() {
       chrome.send('requestDefaultProfileIcons');
 
-      // Use the hash to specify the profile index.
-      var hash = location.hash;
-      if (hash) {
-        $('manage-profile-overlay-manage').hidden = false;
-        $('manage-profile-overlay-delete').hidden = true;
-        ManageProfileOverlay.getInstance().hideErrorBubble_();
-
-        chrome.send('requestProfileInfo', [parseInt(hash.slice(1), 10)]);
-      }
+      // 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)
+        ManageProfileOverlay.getInstance().prepareForManageDialog_();
 
       $('manage-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",
@@ skipping 21 matching lines @@
 
     /**
      * Set an array of default icon URLs. These will be added to the grid that
      * the user will use to choose their profile icon.
      * @param {Array.<string>} iconURLs An array of icon URLs.
      * @private
      */
     receiveDefaultProfileIcons_: function(iconURLs) {
       $('manage-profile-icon-grid').dataModel = new ArrayDataModel(iconURLs);
 
-      // Changing the dataModel resets the selectedItem. Re-select it, if there
-      // is one.
       if (this.profileInfo_)
         $('manage-profile-icon-grid').selectedItem = this.profileInfo_.iconURL;
 
       var grid = $('manage-profile-icon-grid');
       // Recalculate the measured item size.
       grid.measured_ = null;
       grid.columns = 0;
       grid.redraw();
     },
 
@@ skipping 68 matching lines @@
     onIconGridSelectionChanged_: function() {
       var iconURL = $('manage-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,
+     * and shows that section.
+     * @private
+     */
+    prepareForManageDialog_: function() {
+      var profileInfo = BrowserOptions.getCurrentProfile();
+      ManageProfileOverlay.setProfileInfo(profileInfo);
+      $('manage-profile-overlay-manage').hidden = false;
+      $('manage-profile-overlay-delete').hidden = true;
+      this.hideErrorBubble_();
+    },
+
+    /**
      * Display the "Manage Profile" dialog.
-     * @param {Object} profileInfo The profile object of the profile to manage.
      * @private
      */
-    showManageDialog_: function(profileInfo) {
-      ManageProfileOverlay.setProfileInfo(profileInfo);
-      $('manage-profile-overlay-manage').hidden = false;
-      $('manage-profile-overlay-delete').hidden = true;
-      ManageProfileOverlay.getInstance().hideErrorBubble_();
-
+    showManageDialog_: function() {
+      this.prepareForManageDialog_();
       OptionsPage.navigateToPage('manageProfile');
     },
 
     /**
      * Display the "Delete Profile" dialog.
      * @param {Object} profileInfo The profile object of the profile to delete.
      * @private
      */
     showDeleteDialog_: function(profileInfo) {
       ManageProfileOverlay.setProfileInfo(profileInfo);
@@ skipping 23 matching lines @@
       var instance = ManageProfileOverlay.getInstance();
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ManageProfileOverlay: ManageProfileOverlay
   };
 });