Fix profile name resetting to GAIA name

chrome/browser/resources/options/manage_profile_overlay.js

 // Copyright (c) 2011 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;
 
   const localStrings = new LocalStrings();
 
@@ skipping 15 matching lines @@
   ManageProfileOverlay.prototype = {
     // Inherit from OptionsPage.
     __proto__: OptionsPage.prototype,
 
     // Info about the currently managed/deleted profile.
     profileInfo_: null,
 
     // An object containing all known profile names.
     profileNames_: {},
 
+    // The currently selected icon in the icon grid.
+    iconGridSelectedURL_: null,
+
     /**
      * Initialize the page.
      */
     initializePage: function() {
       // Call base class implementation to start preference initialization.
       OptionsPage.prototype.initializePage.call(this);
 
       var self = this;
       var iconGrid = $('manage-profile-icon-grid');
       options.ProfilesIconGrid.decorate(iconGrid);
@@ skipping 38 matching lines @@
      * @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,
      *     };
      * @private
      */
     setProfileInfo_: function(profileInfo) {
+      this.iconGridSelectedURL_ = profileInfo.iconURL;
       this.profileInfo_ = profileInfo;
       $('manage-profile-name').value = profileInfo.name;
       $('manage-profile-icon-grid').selectedItem = profileInfo.iconURL;
     },
 
     /**
      * Sets the name of the currently edited profile.
      * @private
      */
     setProfileName_: function(name) {
@@ skipping 86 matching lines @@
       chrome.send('setProfileNameAndIcon',
                   [this.profileInfo_.filePath, name, iconURL]);
     },
 
     /**
      * Called when the selected icon in the icon grid changes.
      * @private
      */
     onIconGridSelectionChanged_: function() {
       var iconURL = $('manage-profile-icon-grid').selectedItem;
+      if (!iconURL || iconURL == this.iconGridSelectedURL_)
+        return;
+      this.iconGridSelectedURL_ = iconURL;

[binji, 2011/12/12 18:44:52]

Shouldn't this be set, even if iconURL is null?

[sail, 2011/12/12 18:53:58]

The iconURL becomes NULL when the overlay is closed. If we update
iconGridSelectedURL_ here then we'll think the selection has been changed even
when it actually hasn't.

       chrome.send('profileIconSelectionChanged',
                   [this.profileInfo_.filePath, iconURL]);
     },
 
     /**
      * Display the "Manage Profile" dialog.
      * @param {Object} profileInfo The profile object of the profile to manage.
      * @private
      */
     showManageDialog_: function(profileInfo) {
@@ skipping 39 matching lines @@
     ManageProfileOverlay[name] = function(value) {
       ManageProfileOverlay.getInstance()[name + '_'](value);
     };
   });
 
   // Export
   return {
     ManageProfileOverlay: ManageProfileOverlay
   };
 });