OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/android/preferences/pref_service_bridge.h" | 5 #include "chrome/browser/android/preferences/pref_service_bridge.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
642 } | 642 } |
643 std::vector<std::string> excluding_domains; | 643 std::vector<std::string> excluding_domains; |
644 base::android::AppendJavaStringArrayToStringVector( | 644 base::android::AppendJavaStringArrayToStringVector( |
645 env, jexcluding_domains.obj(), &excluding_domains); | 645 env, jexcluding_domains.obj(), &excluding_domains); |
646 RegistrableDomainFilterBuilder filter_builder( | 646 RegistrableDomainFilterBuilder filter_builder( |
647 BrowsingDataFilterBuilder::BLACKLIST); | 647 BrowsingDataFilterBuilder::BLACKLIST); |
648 for (const std::string& domain : excluding_domains) { | 648 for (const std::string& domain : excluding_domains) { |
649 filter_builder.AddRegisterableDomain(domain); | 649 filter_builder.AddRegisterableDomain(domain); |
650 } | 650 } |
651 | 651 |
| 652 if (!excluding_domains.empty()) { |
| 653 ImportantSitesUtil::RecordMetricsForBlacklistedSites(GetOriginalProfile(), |
| 654 excluding_domains); |
| 655 } |
| 656 |
652 browsing_data_remover->RemoveWithFilter( | 657 browsing_data_remover->RemoveWithFilter( |
653 BrowsingDataRemover::Period( | 658 BrowsingDataRemover::Period( |
654 static_cast<BrowsingDataRemover::TimePeriod>(time_period)), | 659 static_cast<BrowsingDataRemover::TimePeriod>(time_period)), |
655 remove_mask, BrowsingDataHelper::UNPROTECTED_WEB, filter_builder); | 660 remove_mask, BrowsingDataHelper::UNPROTECTED_WEB, filter_builder); |
656 } | 661 } |
657 | 662 |
658 static jboolean CanDeleteBrowsingHistory(JNIEnv* env, | 663 static jboolean CanDeleteBrowsingHistory(JNIEnv* env, |
659 const JavaParamRef<jobject>& obj) { | 664 const JavaParamRef<jobject>& obj) { |
660 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory); | 665 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory); |
661 } | 666 } |
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1184 | 1189 |
1185 return ConvertJavaStringToUTF8(android_permission); | 1190 return ConvertJavaStringToUTF8(android_permission); |
1186 } | 1191 } |
1187 | 1192 |
1188 static void SetSupervisedUserId(JNIEnv* env, | 1193 static void SetSupervisedUserId(JNIEnv* env, |
1189 const JavaParamRef<jobject>& obj, | 1194 const JavaParamRef<jobject>& obj, |
1190 const JavaParamRef<jstring>& pref) { | 1195 const JavaParamRef<jstring>& pref) { |
1191 GetPrefService()->SetString(prefs::kSupervisedUserId, | 1196 GetPrefService()->SetString(prefs::kSupervisedUserId, |
1192 ConvertJavaStringToUTF8(env, pref)); | 1197 ConvertJavaStringToUTF8(env, pref)); |
1193 } | 1198 } |
OLD | NEW |