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 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
625 break; | 625 break; |
626 case NUM_TYPES: | 626 case NUM_TYPES: |
627 NOTREACHED(); | 627 NOTREACHED(); |
628 } | 628 } |
629 } | 629 } |
630 std::vector<std::string> excluding_domains; | 630 std::vector<std::string> excluding_domains; |
631 base::android::AppendJavaStringArrayToStringVector( | 631 base::android::AppendJavaStringArrayToStringVector( |
632 env, jexcluding_domains.obj(), &excluding_domains); | 632 env, jexcluding_domains.obj(), &excluding_domains); |
633 RegistrableDomainFilterBuilder filter_builder( | 633 RegistrableDomainFilterBuilder filter_builder( |
634 BrowsingDataFilterBuilder::BLACKLIST); | 634 BrowsingDataFilterBuilder::BLACKLIST); |
| 635 LOG(ERROR) << "Clearing excluding domains: "; |
635 for (const std::string& domain : excluding_domains) { | 636 for (const std::string& domain : excluding_domains) { |
636 filter_builder.AddRegisterableDomain(domain); | 637 filter_builder.AddRegisterableDomain(domain); |
| 638 LOG(ERROR) << domain; |
637 } | 639 } |
638 | 640 |
639 browsing_data_remover->RemoveWithFilter( | 641 browsing_data_remover->RemoveWithFilter( |
640 BrowsingDataRemover::Period( | 642 BrowsingDataRemover::Period( |
641 static_cast<BrowsingDataRemover::TimePeriod>(time_period)), | 643 static_cast<BrowsingDataRemover::TimePeriod>(time_period)), |
642 remove_mask, BrowsingDataHelper::UNPROTECTED_WEB, filter_builder); | 644 remove_mask, BrowsingDataHelper::UNPROTECTED_WEB, filter_builder); |
643 } | 645 } |
644 | 646 |
645 static jboolean CanDeleteBrowsingHistory(JNIEnv* env, | 647 static jboolean CanDeleteBrowsingHistory(JNIEnv* env, |
646 const JavaParamRef<jobject>& obj) { | 648 const JavaParamRef<jobject>& obj) { |
647 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory); | 649 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory); |
648 } | 650 } |
649 | 651 |
650 static void FetchImportantSites(JNIEnv* env, | 652 static void FetchImportantSites(JNIEnv* env, |
651 const JavaParamRef<jclass>& clazz, | 653 const JavaParamRef<jclass>& clazz, |
652 const JavaParamRef<jobject>& java_callback) { | 654 const JavaParamRef<jobject>& java_callback) { |
653 std::vector<std::string> important_domains = | 655 std::vector<std::string> important_domains = |
654 ImportantSitesUtil::GetImportantRegisterableDomains(GetOriginalProfile(), | 656 ImportantSitesUtil::GetImportantRegisterableDomains(GetOriginalProfile(), |
655 kMaxImportantSites); | 657 kMaxImportantSites); |
656 ScopedJavaLocalRef<jobjectArray> string_array = | 658 ScopedJavaLocalRef<jobjectArray> string_array = |
657 base::android::ToJavaArrayOfStrings(env, important_domains); | 659 base::android::ToJavaArrayOfStrings(env, important_domains); |
658 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady( | 660 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady( |
659 env, java_callback.obj(), string_array.obj()); | 661 env, java_callback.obj(), string_array.obj()); |
660 } | 662 } |
661 | 663 |
| 664 static jint GetMaxImportantSites(JNIEnv* env, |
| 665 const JavaParamRef<jclass>& clazz) { |
| 666 return kMaxImportantSites; |
| 667 } |
| 668 |
| 669 static void MarkOriginAsImportantForTesting( |
| 670 JNIEnv* env, |
| 671 const JavaParamRef<jclass>& clazz, |
| 672 const JavaParamRef<jstring>& jorigin) { |
| 673 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); |
| 674 CHECK(origin.is_valid()); |
| 675 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), |
| 676 origin); |
| 677 } |
| 678 |
662 static void ShowNoticeAboutOtherFormsOfBrowsingHistory( | 679 static void ShowNoticeAboutOtherFormsOfBrowsingHistory( |
663 ScopedJavaGlobalRef<jobject>* listener, | 680 ScopedJavaGlobalRef<jobject>* listener, |
664 bool show) { | 681 bool show) { |
665 JNIEnv* env = AttachCurrentThread(); | 682 JNIEnv* env = AttachCurrentThread(); |
666 UMA_HISTOGRAM_BOOLEAN( | 683 UMA_HISTOGRAM_BOOLEAN( |
667 "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated", show); | 684 "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated", show); |
668 if (!show) | 685 if (!show) |
669 return; | 686 return; |
670 Java_OtherFormsOfBrowsingHistoryListener_showNoticeAboutOtherFormsOfBrowsingHi
story( | 687 Java_OtherFormsOfBrowsingHistoryListener_showNoticeAboutOtherFormsOfBrowsingHi
story( |
671 env, listener->obj()); | 688 env, listener->obj()); |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1132 | 1149 |
1133 return ConvertJavaStringToUTF8(android_permission); | 1150 return ConvertJavaStringToUTF8(android_permission); |
1134 } | 1151 } |
1135 | 1152 |
1136 static void SetSupervisedUserId(JNIEnv* env, | 1153 static void SetSupervisedUserId(JNIEnv* env, |
1137 const JavaParamRef<jobject>& obj, | 1154 const JavaParamRef<jobject>& obj, |
1138 const JavaParamRef<jstring>& pref) { | 1155 const JavaParamRef<jstring>& pref) { |
1139 GetPrefService()->SetString(prefs::kSupervisedUserId, | 1156 GetPrefService()->SetString(prefs::kSupervisedUserId, |
1140 ConvertJavaStringToUTF8(env, pref)); | 1157 ConvertJavaStringToUTF8(env, pref)); |
1141 } | 1158 } |
OLD | NEW |