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

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: Comments, still no tests 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 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 } 694 }
695 695
696 static jboolean CanDeleteBrowsingHistory(JNIEnv* env, 696 static jboolean CanDeleteBrowsingHistory(JNIEnv* env,
697 const JavaParamRef<jobject>& obj) { 697 const JavaParamRef<jobject>& obj) {
698 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory); 698 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory);
699 } 699 }
700 700
701 static void FetchImportantSites(JNIEnv* env, 701 static void FetchImportantSites(JNIEnv* env,
702 const JavaParamRef<jclass>& clazz, 702 const JavaParamRef<jclass>& clazz,
703 const JavaParamRef<jobject>& java_callback) { 703 const JavaParamRef<jobject>& java_callback) {
704 Profile* profile = GetOriginalProfile();
704 std::vector<ImportantSitesUtil::ImportantDomainInfo> important_sites = 705 std::vector<ImportantSitesUtil::ImportantDomainInfo> important_sites =
705 ImportantSitesUtil::GetImportantRegisterableDomains(GetOriginalProfile(), 706 ImportantSitesUtil::GetImportantRegisterableDomains(profile,
706 kMaxImportantSites); 707 kMaxImportantSites);
708 bool dialog_disabled = ImportantSitesUtil::IsDialogDisabled(profile);
707 709
708 std::vector<std::string> important_domains; 710 std::vector<std::string> important_domains;
709 std::vector<int32_t> important_domain_reasons; 711 std::vector<int32_t> important_domain_reasons;
710 std::vector<std::string> important_domain_examples; 712 std::vector<std::string> important_domain_examples;
711 for (const ImportantSitesUtil::ImportantDomainInfo& info : important_sites) { 713 for (const ImportantSitesUtil::ImportantDomainInfo& info : important_sites) {
712 important_domains.push_back(info.registerable_domain); 714 important_domains.push_back(info.registerable_domain);
713 important_domain_reasons.push_back(info.reason_bitfield); 715 important_domain_reasons.push_back(info.reason_bitfield);
714 important_domain_examples.push_back(info.example_origin.spec()); 716 important_domain_examples.push_back(info.example_origin.spec());
715 } 717 }
716 718
717 ScopedJavaLocalRef<jobjectArray> java_domains = 719 ScopedJavaLocalRef<jobjectArray> java_domains =
718 base::android::ToJavaArrayOfStrings(env, important_domains); 720 base::android::ToJavaArrayOfStrings(env, important_domains);
719 ScopedJavaLocalRef<jintArray> java_reasons = 721 ScopedJavaLocalRef<jintArray> java_reasons =
720 base::android::ToJavaIntArray(env, important_domain_reasons); 722 base::android::ToJavaIntArray(env, important_domain_reasons);
721 ScopedJavaLocalRef<jobjectArray> java_origins = 723 ScopedJavaLocalRef<jobjectArray> java_origins =
722 base::android::ToJavaArrayOfStrings(env, important_domain_examples); 724 base::android::ToJavaArrayOfStrings(env, important_domain_examples);
723 725
724 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady( 726 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady(
725 env, java_callback.obj(), java_domains.obj(), java_origins.obj(), 727 env, java_callback.obj(), java_domains.obj(), java_origins.obj(),
726 java_reasons.obj()); 728 java_reasons.obj(), dialog_disabled);
727 } 729 }
728 730
729 // This value should not change during a sessions, as it's used for UMA metrics. 731 // This value should not change during a sessions, as it's used for UMA metrics.
730 static jint GetMaxImportantSites(JNIEnv* env, 732 static jint GetMaxImportantSites(JNIEnv* env,
731 const JavaParamRef<jclass>& clazz) { 733 const JavaParamRef<jclass>& clazz) {
732 return kMaxImportantSites; 734 return kMaxImportantSites;
733 } 735 }
734 736
735 static void MarkOriginAsImportantForTesting( 737 static void MarkOriginAsImportantForTesting(
736 JNIEnv* env, 738 JNIEnv* env,
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 1218
1217 return ConvertJavaStringToUTF8(android_permission); 1219 return ConvertJavaStringToUTF8(android_permission);
1218 } 1220 }
1219 1221
1220 static void SetSupervisedUserId(JNIEnv* env, 1222 static void SetSupervisedUserId(JNIEnv* env,
1221 const JavaParamRef<jobject>& obj, 1223 const JavaParamRef<jobject>& obj,
1222 const JavaParamRef<jstring>& pref) { 1224 const JavaParamRef<jstring>& pref) {
1223 GetPrefService()->SetString(prefs::kSupervisedUserId, 1225 GetPrefService()->SetString(prefs::kSupervisedUserId,
1224 ConvertJavaStringToUTF8(env, pref)); 1226 ConvertJavaStringToUTF8(env, pref));
1225 } 1227 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698