OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/supervised_user_internals_message_handler.h" | 5 #include "chrome/browser/ui/webui/supervised_user_internals_message_handler.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/ptr_util.h" |
11 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
12 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
13 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
14 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
15 #include "base/values.h" | 16 #include "base/values.h" |
16 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/signin/account_tracker_service_factory.h" | 18 #include "chrome/browser/signin/account_tracker_service_factory.h" |
18 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" | 19 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" |
19 #include "chrome/browser/supervised_user/supervised_user_service.h" | 20 #include "chrome/browser/supervised_user/supervised_user_service.h" |
20 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 21 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 SupervisedUserSettingsServiceFactory::GetForProfile(profile); | 239 SupervisedUserSettingsServiceFactory::GetForProfile(profile); |
239 user_settings_subscription_ = settings_service->Subscribe(base::Bind( | 240 user_settings_subscription_ = settings_service->Subscribe(base::Bind( |
240 &SupervisedUserInternalsMessageHandler::SendSupervisedUserSettings, | 241 &SupervisedUserInternalsMessageHandler::SendSupervisedUserSettings, |
241 weak_factory_.GetWeakPtr())); | 242 weak_factory_.GetWeakPtr())); |
242 } | 243 } |
243 | 244 |
244 void SupervisedUserInternalsMessageHandler::SendSupervisedUserSettings( | 245 void SupervisedUserInternalsMessageHandler::SendSupervisedUserSettings( |
245 const base::DictionaryValue* settings) { | 246 const base::DictionaryValue* settings) { |
246 web_ui()->CallJavascriptFunctionUnsafe( | 247 web_ui()->CallJavascriptFunctionUnsafe( |
247 "chrome.supervised_user_internals.receiveUserSettings", | 248 "chrome.supervised_user_internals.receiveUserSettings", |
248 *(settings ? settings : base::Value::CreateNullValue().get())); | 249 *(settings ? settings : base::MakeUnique<base::Value>().get())); |
249 } | 250 } |
250 | 251 |
251 void SupervisedUserInternalsMessageHandler::OnTryURLResult( | 252 void SupervisedUserInternalsMessageHandler::OnTryURLResult( |
252 const std::map<std::string, base::string16>& whitelists, | 253 const std::map<std::string, base::string16>& whitelists, |
253 SupervisedUserURLFilter::FilteringBehavior behavior, | 254 SupervisedUserURLFilter::FilteringBehavior behavior, |
254 supervised_user_error_page::FilteringBehaviorReason reason, | 255 supervised_user_error_page::FilteringBehaviorReason reason, |
255 bool uncertain) { | 256 bool uncertain) { |
256 std::vector<std::string> whitelists_list; | 257 std::vector<std::string> whitelists_list; |
257 for (const auto& whitelist : whitelists) { | 258 for (const auto& whitelist : whitelists) { |
258 whitelists_list.push_back( | 259 whitelists_list.push_back( |
(...skipping 19 matching lines...) Expand all Loading... |
278 supervised_user_error_page::FilteringBehaviorReason reason, | 279 supervised_user_error_page::FilteringBehaviorReason reason, |
279 bool uncertain) { | 280 bool uncertain) { |
280 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 281 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
281 base::DictionaryValue result; | 282 base::DictionaryValue result; |
282 result.SetString("url", url.possibly_invalid_spec()); | 283 result.SetString("url", url.possibly_invalid_spec()); |
283 result.SetString("result", FilteringBehaviorToString(behavior, uncertain)); | 284 result.SetString("result", FilteringBehaviorToString(behavior, uncertain)); |
284 result.SetString("reason", FilteringBehaviorReasonToString(reason)); | 285 result.SetString("reason", FilteringBehaviorReasonToString(reason)); |
285 web_ui()->CallJavascriptFunctionUnsafe( | 286 web_ui()->CallJavascriptFunctionUnsafe( |
286 "chrome.supervised_user_internals.receiveFilteringResult", result); | 287 "chrome.supervised_user_internals.receiveFilteringResult", result); |
287 } | 288 } |
OLD | NEW |