Resolve conflict and commit patch http://codereview.chromium.org/8339014/ to disable delete butto...

chrome/browser/resources/options/personal_options.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;
 
   // State variables.
@@ skipping 39 matching lines @@
       };
       $('customize-sync').onclick = function(event) {
         SyncSetupOverlay.showSetupUI();
       };
 
       // Profiles.
       var profilesList = $('profiles-list');
       options.personal_options.ProfileList.decorate(profilesList);
       profilesList.autoExpands = true;
 
-      profilesList.onchange = function(event) {
-        var selectedProfile = profilesList.selectedItem;
-        var hasSelection = selectedProfile != null;
-        var hasSingleProfile = profilesList.dataModel.length == 1;
-        $('profiles-manage').disabled = !hasSelection ||
-            !selectedProfile.isCurrentProfile;
-        $('profiles-delete').disabled = !hasSingleProfile && !hasSelection;
-      };
+      profilesList.onchange = self.setProfileViewButtonsStatus_;
+
       $('profiles-create').onclick = function(event) {
         chrome.send('createProfile');
       };
       $('profiles-manage').onclick = function(event) {
         var selectedProfile = self.getSelectedProfileItem_();
         if (selectedProfile)
           ManageProfileOverlay.showManageDialog(selectedProfile);
       };
       $('profiles-delete').onclick = function(event) {
         var selectedProfile = self.getSelectedProfileItem_();
@@ skipping 136 matching lines @@
       if (profilesList.hidden) {
         if (profilesList.dataModel.length > 0)
           return profilesList.dataModel.item(0);
       } else {
         return profilesList.selectedItem;
       }
       return null;
     },
 
     /**
+     * Helper function to set the status of profile view buttons to disabled or
+     * enabled, depending on the number of profiles and selection status of the
+     * profiles list.
+     */
+    setProfileViewButtonsStatus_: function() {
+      var profilesList = $('profiles-list');
+      var selectedProfile = profilesList.selectedItem;
+      var hasSelection = selectedProfile != null;
+      var hasSingleProfile = profilesList.dataModel.length == 1;
+      $('profiles-manage').disabled = !hasSelection ||
+          !selectedProfile.isCurrentProfile;
+      $('profiles-delete').disabled = !hasSelection || hasSingleProfile;
+    },
+
+    /**
      * Display the correct dialog layout, depending on how many profiles are
      * available.
      * @param {number} numProfiles The number of profiles to display.
      */
     setProfileViewSingle_: function(numProfiles) {
       var hasSingleProfile = numProfiles == 1;
       $('profiles-list').hidden = hasSingleProfile;
       $('profiles-single-message').hidden = !hasSingleProfile;
       $('profiles-manage').hidden = hasSingleProfile;
       $('profiles-delete').textContent = hasSingleProfile ?
@@ skipping 10 matching lines @@
      *         iconURL: "chrome://path/to/icon/image",
      *         filePath: "/path/to/profile/data/on/disk",
      *         isCurrentProfile: false
      *       };
      */
     setProfilesInfo_: function(profiles) {
       this.setProfileViewSingle_(profiles.length);
       // add it to the list, even if the list is hidden so we can access it
       // later.
       $('profiles-list').dataModel = new ArrayDataModel(profiles);
+      this.setProfileViewButtonsStatus_();
     },
 
     setStartStopButtonVisible_: function(visible) {
       $('start-stop-sync').hidden = !visible;
     },
 
     setStartStopButtonEnabled_: function(enabled) {
       $('start-stop-sync').disabled = !enabled;
     },
 
@@ skipping 76 matching lines @@
       PersonalOptions.getInstance()[name + '_'](value);
     };
   });
 
   // Export
   return {
     PersonalOptions: PersonalOptions
   };
 
 });