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

Side by Side Diff: chrome/browser/ui/webui/settings/safe_browsing_handler.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/settings/safe_browsing_handler.h" 5 #include "chrome/browser/ui/webui/settings/safe_browsing_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "components/prefs/pref_service.h" 10 #include "components/prefs/pref_service.h"
(...skipping 29 matching lines...) Expand all
40 40
41 void SafeBrowsingHandler::OnJavascriptDisallowed() { 41 void SafeBrowsingHandler::OnJavascriptDisallowed() {
42 profile_pref_registrar_.RemoveAll(); 42 profile_pref_registrar_.RemoveAll();
43 } 43 }
44 44
45 void SafeBrowsingHandler::HandleGetSafeBrowsingExtendedReporting( 45 void SafeBrowsingHandler::HandleGetSafeBrowsingExtendedReporting(
46 const base::ListValue* args) { 46 const base::ListValue* args) {
47 AllowJavascript(); 47 AllowJavascript();
48 const base::Value* callback_id; 48 const base::Value* callback_id;
49 CHECK(args->Get(0, &callback_id)); 49 CHECK(args->Get(0, &callback_id));
50 base::FundamentalValue is_enabled( 50 base::Value is_enabled(safe_browsing::IsExtendedReportingEnabled(*prefs_));
51 safe_browsing::IsExtendedReportingEnabled(*prefs_));
52 ResolveJavascriptCallback(*callback_id, is_enabled); 51 ResolveJavascriptCallback(*callback_id, is_enabled);
53 } 52 }
54 53
55 void SafeBrowsingHandler::HandleSetSafeBrowsingExtendedReportingEnabled( 54 void SafeBrowsingHandler::HandleSetSafeBrowsingExtendedReportingEnabled(
56 const base::ListValue* args) { 55 const base::ListValue* args) {
57 bool enabled; 56 bool enabled;
58 CHECK(args->GetBoolean(0, &enabled)); 57 CHECK(args->GetBoolean(0, &enabled));
59 safe_browsing::SetExtendedReportingPref(prefs_, enabled); 58 safe_browsing::SetExtendedReportingPref(prefs_, enabled);
60 } 59 }
61 60
62 void SafeBrowsingHandler::OnPrefChanged(const std::string& pref_name) { 61 void SafeBrowsingHandler::OnPrefChanged(const std::string& pref_name) {
63 DCHECK(pref_name == prefs::kSafeBrowsingExtendedReportingEnabled || 62 DCHECK(pref_name == prefs::kSafeBrowsingExtendedReportingEnabled ||
64 pref_name == prefs::kSafeBrowsingScoutReportingEnabled); 63 pref_name == prefs::kSafeBrowsingScoutReportingEnabled);
65 64
66 base::FundamentalValue is_enabled( 65 base::Value is_enabled(safe_browsing::IsExtendedReportingEnabled(*prefs_));
67 safe_browsing::IsExtendedReportingEnabled(*prefs_));
68 CallJavascriptFunction( 66 CallJavascriptFunction(
69 "cr.webUIListenerCallback", 67 "cr.webUIListenerCallback",
70 base::StringValue("safe-browsing-extended-reporting-change"), is_enabled); 68 base::StringValue("safe-browsing-extended-reporting-change"), is_enabled);
71 } 69 }
72 70
73 } // namespace settings 71 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698