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

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

Issue 1961183002: MD Settings: Update some Settings handlers to use new JS lifecycle management. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/appearance_handler.cc
diff --git a/chrome/browser/ui/webui/settings/appearance_handler.cc b/chrome/browser/ui/webui/settings/appearance_handler.cc
index 93bf449c366f67b01870d220f6b0244c73f272ac..321c93c18f03464ad5dabe468fa51e46c0dc9b1f 100644
--- a/chrome/browser/ui/webui/settings/appearance_handler.cc
+++ b/chrome/browser/ui/webui/settings/appearance_handler.cc
@@ -23,14 +23,9 @@ namespace settings {
AppearanceHandler::AppearanceHandler(content::WebUI* webui)
: profile_(Profile::FromWebUI(webui)) {
- registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
- content::Source<ThemeService>(
- ThemeServiceFactory::GetForProfile(profile_)));
}
-AppearanceHandler::~AppearanceHandler() {
- registrar_.RemoveAll();
-}
+AppearanceHandler::~AppearanceHandler() {}
void AppearanceHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback(
@@ -48,16 +43,25 @@ void AppearanceHandler::RegisterMessages() {
#endif
}
+void AppearanceHandler::OnJavascriptAllowed() {
+ registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
+ content::Source<ThemeService>(
+ ThemeServiceFactory::GetForProfile(profile_)));
+}
+
+void AppearanceHandler::OnJavascriptDisallowed() {
+ registrar_.RemoveAll();
+}
+
void AppearanceHandler::Observe(
int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
switch (type) {
case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
- web_ui()->CallJavascriptFunction(
- "cr.webUIListenerCallback",
- base::StringValue("reset-theme-enabled-changed"),
- base::FundamentalValue(ResetThemeEnabled()));
+ CallJavascriptFunction("cr.webUIListenerCallback",
+ base::StringValue("reset-theme-enabled-changed"),
+ base::FundamentalValue(ResetThemeEnabled()));
break;
}
default:
@@ -76,6 +80,8 @@ bool AppearanceHandler::ResetThemeEnabled() const {
void AppearanceHandler::HandleGetResetThemeEnabled(
const base::ListValue* args) {
+ AllowJavascript();
+
CHECK_EQ(1U, args->GetSize());
const base::Value* callback_id;
CHECK(args->Get(0, &callback_id));

Powered by Google App Engine
This is Rietveld 408576698