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

Side by Side Diff: chrome/browser/android/preferences/pref_service_bridge.cc

Issue 2669873002: [ImportantSites] Implementing dialog level blacklisting and blacklist expiration (Closed)
Patch Set: android compile Created 3 years, 10 months 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 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 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 } 710 }
711 711
712 static jboolean CanDeleteBrowsingHistory(JNIEnv* env, 712 static jboolean CanDeleteBrowsingHistory(JNIEnv* env,
713 const JavaParamRef<jobject>& obj) { 713 const JavaParamRef<jobject>& obj) {
714 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory); 714 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory);
715 } 715 }
716 716
717 static void FetchImportantSites(JNIEnv* env, 717 static void FetchImportantSites(JNIEnv* env,
718 const JavaParamRef<jclass>& clazz, 718 const JavaParamRef<jclass>& clazz,
719 const JavaParamRef<jobject>& java_callback) { 719 const JavaParamRef<jobject>& java_callback) {
720 Profile* profile = GetOriginalProfile();
720 std::vector<ImportantSitesUtil::ImportantDomainInfo> important_sites = 721 std::vector<ImportantSitesUtil::ImportantDomainInfo> important_sites =
721 ImportantSitesUtil::GetImportantRegisterableDomains(GetOriginalProfile(), 722 ImportantSitesUtil::GetImportantRegisterableDomains(profile,
722 kMaxImportantSites); 723 kMaxImportantSites);
724 bool dialog_disabled = ImportantSitesUtil::IsDialogDisabled(profile);
723 725
724 std::vector<std::string> important_domains; 726 std::vector<std::string> important_domains;
725 std::vector<int32_t> important_domain_reasons; 727 std::vector<int32_t> important_domain_reasons;
726 std::vector<std::string> important_domain_examples; 728 std::vector<std::string> important_domain_examples;
727 for (const ImportantSitesUtil::ImportantDomainInfo& info : important_sites) { 729 for (const ImportantSitesUtil::ImportantDomainInfo& info : important_sites) {
728 important_domains.push_back(info.registerable_domain); 730 important_domains.push_back(info.registerable_domain);
729 important_domain_reasons.push_back(info.reason_bitfield); 731 important_domain_reasons.push_back(info.reason_bitfield);
730 important_domain_examples.push_back(info.example_origin.spec()); 732 important_domain_examples.push_back(info.example_origin.spec());
731 } 733 }
732 734
733 ScopedJavaLocalRef<jobjectArray> java_domains = 735 ScopedJavaLocalRef<jobjectArray> java_domains =
734 base::android::ToJavaArrayOfStrings(env, important_domains); 736 base::android::ToJavaArrayOfStrings(env, important_domains);
735 ScopedJavaLocalRef<jintArray> java_reasons = 737 ScopedJavaLocalRef<jintArray> java_reasons =
736 base::android::ToJavaIntArray(env, important_domain_reasons); 738 base::android::ToJavaIntArray(env, important_domain_reasons);
737 ScopedJavaLocalRef<jobjectArray> java_origins = 739 ScopedJavaLocalRef<jobjectArray> java_origins =
738 base::android::ToJavaArrayOfStrings(env, important_domain_examples); 740 base::android::ToJavaArrayOfStrings(env, important_domain_examples);
739 741
740 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady( 742 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady(
741 env, java_callback.obj(), java_domains.obj(), java_origins.obj(), 743 env, java_callback.obj(), java_domains.obj(), java_origins.obj(),
742 java_reasons.obj()); 744 java_reasons.obj(), dialog_disabled);
743 } 745 }
744 746
745 // This value should not change during a sessions, as it's used for UMA metrics. 747 // This value should not change during a sessions, as it's used for UMA metrics.
746 static jint GetMaxImportantSites(JNIEnv* env, 748 static jint GetMaxImportantSites(JNIEnv* env,
747 const JavaParamRef<jclass>& clazz) { 749 const JavaParamRef<jclass>& clazz) {
748 return kMaxImportantSites; 750 return kMaxImportantSites;
749 } 751 }
750 752
751 static void MarkOriginAsImportantForTesting( 753 static void MarkOriginAsImportantForTesting(
752 JNIEnv* env, 754 JNIEnv* env,
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1232 1234
1233 return ConvertJavaStringToUTF8(android_permission); 1235 return ConvertJavaStringToUTF8(android_permission);
1234 } 1236 }
1235 1237
1236 static void SetSupervisedUserId(JNIEnv* env, 1238 static void SetSupervisedUserId(JNIEnv* env,
1237 const JavaParamRef<jobject>& obj, 1239 const JavaParamRef<jobject>& obj,
1238 const JavaParamRef<jstring>& pref) { 1240 const JavaParamRef<jstring>& pref) {
1239 GetPrefService()->SetString(prefs::kSupervisedUserId, 1241 GetPrefService()->SetString(prefs::kSupervisedUserId,
1240 ConvertJavaStringToUTF8(env, pref)); 1242 ConvertJavaStringToUTF8(env, pref));
1241 } 1243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698