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

chrome/browser/ui/webui/options/startup_pages_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_service.h"
-#include "base/strings/string_number_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
@@ skipping 85 matching lines @@
 void StartupPagesHandler::OnModelChanged() {
   ListValue startup_pages;
   int page_count = startup_custom_pages_table_model_->RowCount();
   std::vector<GURL> urls = startup_custom_pages_table_model_->GetURLs();
   for (int i = 0; i < page_count; ++i) {
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("title", startup_custom_pages_table_model_->GetText(i, 0));
     entry->SetString("url", urls[i].spec());
     entry->SetString("tooltip",
                      startup_custom_pages_table_model_->GetTooltip(i));
-    entry->SetString("modelIndex", base::IntToString(i));
+    entry->SetInteger("modelIndex", i);
     startup_pages.Append(entry);
   }
 
   web_ui()->CallJavascriptFunction("StartupOverlay.updateStartupPages",
                                    startup_pages);
 }
 
 void StartupPagesHandler::OnItemsChanged(int start, int length) {
   OnModelChanged();
 }
 
 void StartupPagesHandler::OnItemsAdded(int start, int length) {
   OnModelChanged();
 }
 
 void StartupPagesHandler::OnItemsRemoved(int start, int length) {
   OnModelChanged();
 }
 
 void StartupPagesHandler::SetStartupPagesToCurrentPages(
     const ListValue* args) {
   startup_custom_pages_table_model_->SetToCurrentlyOpenPages();
 }
 
 void StartupPagesHandler::RemoveStartupPages(const ListValue* args) {
   for (int i = args->GetSize() - 1; i >= 0; --i) {
-    std::string string_value;
-    CHECK(args->GetString(i, &string_value));
+    int selected_index;
+    CHECK(args->GetInteger(i, &selected_index));
 
-    int selected_index;
-    base::StringToInt(string_value, &selected_index);
     if (selected_index < 0 ||
         selected_index >= startup_custom_pages_table_model_->RowCount()) {
       NOTREACHED();
       return;
     }
     startup_custom_pages_table_model_->Remove(selected_index);
   }
 }
 
 void StartupPagesHandler::AddStartupPage(const ListValue* args) {
   std::string url_string;
   CHECK_EQ(args->GetSize(), 1U);
   CHECK(args->GetString(0, &url_string));
 
   GURL url = URLFixerUpper::FixupURL(url_string, std::string());
   if (!url.is_valid())
     return;
   int index = startup_custom_pages_table_model_->RowCount();
   startup_custom_pages_table_model_->Add(index, url);
 }
 
 void StartupPagesHandler::EditStartupPage(const ListValue* args) {
   std::string url_string;
-  std::string index_string;
   int index;
   CHECK_EQ(args->GetSize(), 2U);
-  CHECK(args->GetString(0, &index_string));
-  CHECK(base::StringToInt(index_string, &index));
+  CHECK(args->GetInteger(0, &index));
   CHECK(args->GetString(1, &url_string));
 
   if (index < 0 || index > startup_custom_pages_table_model_->RowCount()) {
     NOTREACHED();
     return;
   }
 
   std::vector<GURL> urls = startup_custom_pages_table_model_->GetURLs();
   urls[index] = URLFixerUpper::FixupURL(url_string, std::string());
   startup_custom_pages_table_model_->SetURLs(urls);
 }
 
 void StartupPagesHandler::DragDropStartupPage(const ListValue* args) {
   CHECK_EQ(args->GetSize(), 2U);
 
-  // TODO(dcheng): Due to http://crbug.com/122102, we can receive drag and drop
-  // events even if there are no entries in the model. Remove this check once
-  // that bug is fixed.
-  if (startup_custom_pages_table_model_->RowCount() == 0)
-    return;
-
-  std::string value;
   int to_index;
 
-  CHECK(args->GetString(0, &value));
-  base::StringToInt(value, &to_index);
+  CHECK(args->GetInteger(0, &to_index));
 
   const ListValue* selected;
   CHECK(args->GetList(1, &selected));
 
   std::vector<int> index_list;
   for (size_t i = 0; i < selected->GetSize(); ++i) {
     int index;
-    CHECK(selected->GetString(i, &value));
-    base::StringToInt(value, &index);
+    CHECK(selected->GetInteger(i, &index));
     index_list.push_back(index);
   }
 
   startup_custom_pages_table_model_->MoveURLs(to_index, index_list);
 }
 
 void StartupPagesHandler::SaveStartupPagesPref() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
@@ skipping 26 matching lines @@
 
 void StartupPagesHandler::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = autocomplete_controller_->result();
   ListValue suggestions;
   OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions);
   web_ui()->CallJavascriptFunction(
       "StartupOverlay.updateAutocompleteSuggestions", suggestions);
 }
 
 }  // namespace options