Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1696)

Unified Diff: chrome/browser/resources/options/browser_options_startup_page_list.js

Issue 12548008: Really fix crash when dragging and dropping in chrome://settings/startup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Trim quotes Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/browser_options_startup_page_list.js
diff --git a/chrome/browser/resources/options/browser_options_startup_page_list.js b/chrome/browser/resources/options/browser_options_startup_page_list.js
index 1fa9252523164f2466f2980c3c47353439da8900..23f7c1a43a5cabf4863f2c27c6fa1c6f370adb71 100644
--- a/chrome/browser/resources/options/browser_options_startup_page_list.js
+++ b/chrome/browser/resources/options/browser_options_startup_page_list.js
@@ -45,7 +45,7 @@ cr.define('options.browser_options', function() {
var pageInfo = this.pageInfo_;
- if (pageInfo.modelIndex == '-1') {
+ if (pageInfo.modelIndex == -1) {
this.isPlaceholder = true;
pageInfo.title = loadTimeData.getString('startupAddLabel');
pageInfo.url = '';
@@ -149,7 +149,7 @@ cr.define('options.browser_options', function() {
/** @override */
deleteItemAtIndex: function(index) {
- chrome.send('removeStartupPages', [String(index)]);
+ chrome.send('removeStartupPages', [index]);
},
/**
@@ -233,6 +233,12 @@ cr.define('options.browser_options', function() {
*/
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.
@@ -240,13 +246,8 @@ cr.define('options.browser_options', function() {
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]);
},
/**
« no previous file with comments | « chrome/browser/custom_home_pages_table_model.cc ('k') | chrome/browser/resources/options/startup_overlay.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698