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

chrome/browser/resources/options/personal_options.js

Index: chrome/browser/resources/options/personal_options.js
===================================================================
--- chrome/browser/resources/options/personal_options.js	(revision 107614)
+++ chrome/browser/resources/options/personal_options.js	(working copy)
@@ -57,14 +57,8 @@
       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');
       };
@@ -221,6 +215,21 @@
     },
 
     /**
+     * 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.
@@ -251,6 +260,7 @@
       // 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) {