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

Unified Diff: chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc

Issue 1869883003: MD Settings: On Startup, extract dialog to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Typo Created 4 years, 8 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/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..78f7506d6a8351b5753ce3550aeb8bc2060de76e 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,15 @@ void StartupPagesHandler::OnItemsRemoved(int start, int length) {
}
void StartupPagesHandler::HandleAddStartupPage(const base::ListValue* args) {
+ CHECK_EQ(2U, args->GetSize());
Dan Beam 2016/04/08 23:24:42 nit: \n
dpapad 2016/04/09 00:02:18 Done.
+ const base::Value* callback_id;
+ CHECK(args->Get(0, &callback_id));
Dan Beam 2016/04/08 23:24:42 nit: \n
dpapad 2016/04/09 00:02:18 Done.
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 +100,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(

Powered by Google App Engine
This is Rietveld 408576698