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

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

Issue 2781623006: MD Settings: Fix Appearance home page URL crash (Closed)
Patch Set: Created 3 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/ui/webui/settings/on_startup_handler.cc
diff --git a/chrome/browser/ui/webui/settings/on_startup_handler.cc b/chrome/browser/ui/webui/settings/on_startup_handler.cc
index 000bc899242126e5d215288222449b76f2ce4ace..10b4b26a660c84f0d928e396146c4174a002c5f0 100644
--- a/chrome/browser/ui/webui/settings/on_startup_handler.cc
+++ b/chrome/browser/ui/webui/settings/on_startup_handler.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "chrome/browser/extensions/settings_api_helpers.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/settings_utils.h"
#include "content/public/browser/web_ui.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/management_policy.h"
@@ -23,6 +24,10 @@ void OnStartupHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback(
"getNtpExtension", base::Bind(&OnStartupHandler::HandleGetNtpExtension,
base::Unretained(this)));
+ web_ui()->RegisterMessageCallback(
+ "validateStartupPage",
+ base::Bind(&OnStartupHandler::HandleValidateStartupPage,
+ base::Unretained(this)));
}
void OnStartupHandler::HandleGetNtpExtension(const base::ListValue* args) {
@@ -50,4 +55,19 @@ void OnStartupHandler::HandleGetNtpExtension(const base::ListValue* args) {
ResolveJavascriptCallback(*callback_id, dict);
}
+void OnStartupHandler::HandleValidateStartupPage(const base::ListValue* args) {
+ AllowJavascript();
+
+ CHECK_EQ(args->GetSize(), 2U);
+
+ const base::Value* callback_id;
+ CHECK(args->Get(0, &callback_id));
+
+ std::string url_string;
+ CHECK(args->GetString(1, &url_string));
+
+ bool valid = settings_utils::FixupAndValidateStartupPage(url_string, nullptr);
+ ResolveJavascriptCallback(*callback_id, base::Value(valid));
+}
+
} // namespace settings

Powered by Google App Engine
This is Rietveld 408576698