Added user settings to chrome://supervised-user-internals.

chrome/browser/ui/webui/supervised_user_internals_message_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/supervised_user_internals_message_handler.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #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"
 
 using content::BrowserThread;
 
 namespace {
 
 // Creates a 'section' for display on about:supervised-user-internals,
 // consisting of a title and a list of fields. Returns a pointer to the new
@@ skipping 216 matching lines @@
   AddSectionEntry(section_filter, "Online checks active",
                   filter->HasAsyncURLChecker());
   AddSectionEntry(section_filter, "Default behavior",
                   FilteringBehaviorToString(
                       filter->GetDefaultFilteringBehavior()));
 
   base::DictionaryValue result;
   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);

[Bernhard Bauer, 2015/08/18 13:09:09]

Nit: Broken lines are indentend four spaces.

[PEConn2, 2015/08/18 14:02:58]

Done.

+  settings_service->Subscribe(base::Bind(

[Bernhard Bauer, 2015/08/18 13:09:09]

Hm... any time we open this page, this will subscribe a new callback, which is
then no-op'ed out when this object is destroyed, but is still subscribed,
essentially making this a (small) leak. Maybe we should change the interface to
SupervisedUserSettingsService so that it allows unsubscription, e.g. by
returning a base::CallbackList::Subscription. But we can do that in a separate
CL and rebase this one on top, or do it in a followup CL (but in that case we
should add a TODO here).

[PEConn2, 2015/08/18 14:02:58]

Done.

+        &SupervisedUserInternalsMessageHandler::SendSupervisedUserSettings,
+        weak_factory_.GetWeakPtr()));
+}
+
+void SupervisedUserInternalsMessageHandler::SendSupervisedUserSettings(
+    const base::DictionaryValue* settings){
+  web_ui()->CallJavascriptFunction(
+      "chrome.supervised_user_internals.receiveUserSettings",
+      *settings);
 }
 
 void SupervisedUserInternalsMessageHandler::OnTryURLResult(
     SupervisedUserURLFilter::FilteringBehavior behavior,
     SupervisedUserURLFilter::FilteringBehaviorReason reason,
     bool uncertain) {
   web_ui()->CallJavascriptFunction(
       "chrome.supervised_user_internals.receiveTryURLResult",
       base::StringValue(FilteringBehaviorToString(behavior, uncertain)));
 }
 
 void SupervisedUserInternalsMessageHandler::OnURLChecked(
     const GURL& url,
     SupervisedUserURLFilter::FilteringBehavior behavior,
     SupervisedUserURLFilter::FilteringBehaviorReason reason,
     bool uncertain) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::DictionaryValue result;
   result.SetString("url", url.possibly_invalid_spec());
   result.SetString("result", FilteringBehaviorToString(behavior, uncertain));
   result.SetString("reason", FilteringBehaviorReasonToString(reason));
   web_ui()->CallJavascriptFunction(
       "chrome.supervised_user_internals.receiveFilteringResult", result);
 }