Index: chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc |
diff --git a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc |
index cc20a5db1e5d459f250f4b53b2f081d6fb220c53..0ba5298d177d57b9f125804f53cd6fce065091d2 100644 |
--- a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc |
+++ b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc |
@@ -81,15 +81,17 @@ void StartupPagesHandler::OnItemsRemoved(int start, int length) { |
} |
void StartupPagesHandler::HandleAddStartupPage(const base::ListValue* args) { |
+ CHECK_EQ(2U, args->GetSize()); |
+ |
+ const base::Value* callback_id; |
+ CHECK(args->Get(0, &callback_id)); |
+ |
std::string url_string; |
- if (!args->GetString(0, &url_string)) { |
- NOTREACHED(); |
- return; |
- } |
+ CHECK(args->GetString(1, &url_string)); |
GURL url; |
if (!settings_utils::FixupAndValidateStartupPage(url_string, &url)) { |
- NOTREACHED(); |
+ ResolveJavascriptCallback(*callback_id, base::FundamentalValue(false)); |
return; |
} |
@@ -100,6 +102,7 @@ void StartupPagesHandler::HandleAddStartupPage(const base::ListValue* args) { |
startup_custom_pages_table_model_.Add(index, url); |
SaveStartupPagesPref(); |
+ ResolveJavascriptCallback(*callback_id, base::FundamentalValue(true)); |
} |
void StartupPagesHandler::HandleOnStartupPrefsPageLoad( |