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

Unified Diff: chrome/browser/ui/webui/supervised_user_internals_message_handler.cc

Issue 1300643002: Added user settings to chrome://supervised-user-internals. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 1st response to comments Created 5 years, 4 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
« no previous file with comments | « chrome/browser/ui/webui/supervised_user_internals_message_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/supervised_user_internals_message_handler.cc
diff --git a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc
index 234c79964382074cf0532bbd7c42005fd1b2bdd5..e5709816b9cacdfbefefb8a88e3ef5f331e6c47c 100644
--- a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc
+++ b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc
@@ -10,6 +10,8 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/supervised_user/supervised_user_service.h"
#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
#include "components/url_formatter/url_fixer.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_ui.h"
@@ -246,6 +248,23 @@ void SupervisedUserInternalsMessageHandler::SendBasicInfo() {
result.Set("sections", section_list.Pass());
web_ui()->CallJavascriptFunction(
"chrome.supervised_user_internals.receiveBasicInfo", result);
+
+ // Trigger retrieval of the user settings
+ SupervisedUserSettingsService* settings_service =
+ SupervisedUserSettingsServiceFactory::GetForProfile(profile);
+ // TODO: Change interface to SupervisedUserSettingsService to allow
Bernhard Bauer 2015/08/18 15:39:23 Nit: Write TODOs in the form TODO(ldap), so it's e
+ // unsubscription, otherwise the subscription remains after this
+ // object is destroyed resulting in a small memory leak.
+ settings_service->Subscribe(base::Bind(
+ &SupervisedUserInternalsMessageHandler::SendSupervisedUserSettings,
+ weak_factory_.GetWeakPtr()));
+}
+
+void SupervisedUserInternalsMessageHandler::SendSupervisedUserSettings(
+ const base::DictionaryValue* settings){
+ web_ui()->CallJavascriptFunction(
+ "chrome.supervised_user_internals.receiveUserSettings",
+ *settings);
}
void SupervisedUserInternalsMessageHandler::OnTryURLResult(
« no previous file with comments | « chrome/browser/ui/webui/supervised_user_internals_message_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698