Really fix crash when dragging and dropping in chrome://settings/startup

chrome/browser/resources/options/browser_options_startup_page_list.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.browser_options', function() {
   /** @const */ var AutocompleteList = cr.ui.AutocompleteList;
   /** @const */ var InlineEditableItem = options.InlineEditableItem;
   /** @const */ var InlineEditableItemList = options.InlineEditableItemList;
 
   /**
@@ skipping 27 matching lines @@
      * @private
      */
     urlField_: null,
 
     /** @override */
     decorate: function() {
       InlineEditableItem.prototype.decorate.call(this);
 
       var pageInfo = this.pageInfo_;
 
-      if (pageInfo.modelIndex == '-1') {
+      if (pageInfo.modelIndex == -1) {
         this.isPlaceholder = true;
         pageInfo.title = loadTimeData.getString('startupAddLabel');
         pageInfo.url = '';
       }
 
       var titleEl = this.ownerDocument.createElement('div');
       titleEl.className = 'title';
       titleEl.classList.add('favicon-cell');
       titleEl.classList.add('weakrtl');
       titleEl.textContent = pageInfo.title;
@@ skipping 83 matching lines @@
 
     /** @override */
     createItem: function(pageInfo) {
       var item = new StartupPageListItem(pageInfo);
       item.urlField_.disabled = this.disabled;
       return item;
     },
 
     /** @override */
     deleteItemAtIndex: function(index) {
-      chrome.send('removeStartupPages', [String(index)]);
+      chrome.send('removeStartupPages', [index]);
     },
 
     /**
      * Computes the target item of drop event.
      * @param {Event} e The drop or dragover event.
      * @private
      */
     getTargetFromDropEvent_: function(e) {
       var target = e.target;
       // e.target may be an inner element of the list item
@@ skipping 63 matching lines @@
       e.preventDefault();
     },
 
     /*
      * Handles the drop event.
      * @param {Event} e The drop event.
      * @private
      */
     handleDrop_: function(e) {
       var dropTarget = this.getTargetFromDropEvent_(e);
+
+      if (!(dropTarget instanceof StartupPageListItem) ||
+          dropTarget.pageInfo_.modelIndex == -1) {
+        return;
+      }
+
       this.hideDropMarker_();
 
       // Insert the selection at the new position.
       var newIndex = this.dataModel.indexOf(dropTarget.pageInfo_);
       if (this.dropPos == 'below')
         newIndex += 1;
 
-      var selected = this.selectionModel.selectedIndexes;
-      var stringized_selected = [];
-      for (var j = 0; j < selected.length; j++)
-        stringized_selected.push(String(selected[j]));
-
       chrome.send('dragDropStartupPage',
-          [String(newIndex), stringized_selected]);
+                  [newIndex, this.selectionModel.selectedIndexes]);

[Dan Beam, 2013/03/09 00:22:04]

nit: plural of index is indices, gar! </vent> (don't need to change)

     },
 
     /**
      * Handles the dragleave event.
      * @param {Event} e The dragleave event.
      * @private
      */
     handleDragLeave_: function(e) {
       this.hideDropMarker_();
     },
@@ skipping 40 matching lines @@
       this.hideDropMarkerTimer_ = window.setTimeout(function() {
         $('startupPagesListDropmarker').style.display = '';
       }, 100);
     },
   };
 
   return {
     StartupPageList: StartupPageList
   };
 });