| 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> |
| 11 #include <set> | 11 #include <set> |
| 12 #include <string> | 12 #include <string> |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "base/android/build_info.h" | 15 #include "base/android/build_info.h" |
| 16 #include "base/android/jni_android.h" | 16 #include "base/android/jni_android.h" |
| 17 #include "base/android/jni_array.h" | 17 #include "base/android/jni_array.h" |
| 18 #include "base/android/jni_string.h" | 18 #include "base/android/jni_string.h" |
| 19 #include "base/android/jni_weak_ref.h" | 19 #include "base/android/jni_weak_ref.h" |
| 20 #include "base/feature_list.h" | 20 #include "base/feature_list.h" |
| 21 #include "base/files/file_path.h" | 21 #include "base/files/file_path.h" |
| 22 #include "base/files/file_util.h" | 22 #include "base/files/file_util.h" |
| 23 #include "base/metrics/histogram_macros.h" | 23 #include "base/metrics/histogram_macros.h" |
| 24 #include "base/scoped_observer.h" | 24 #include "base/scoped_observer.h" |
| 25 #include "base/strings/string_split.h" | 25 #include "base/strings/string_split.h" |
| 26 #include "base/strings/string_util.h" | 26 #include "base/strings/string_util.h" |
| 27 #include "base/values.h" | 27 #include "base/values.h" |
| 28 #include "chrome/browser/browser_process.h" | 28 #include "chrome/browser/browser_process.h" |
| 29 #include "chrome/browser/browsing_data/browsing_data_filter_builder.h" | |
| 30 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 29 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
| 31 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 30 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
| 32 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" | 31 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
| 33 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 32 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 34 #include "chrome/browser/engagement/important_sites_util.h" | 33 #include "chrome/browser/engagement/important_sites_util.h" |
| 35 #include "chrome/browser/history/web_history_service_factory.h" | 34 #include "chrome/browser/history/web_history_service_factory.h" |
| 36 #include "chrome/browser/net/prediction_options.h" | 35 #include "chrome/browser/net/prediction_options.h" |
| 37 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 36 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 38 #include "chrome/browser/profiles/profile_manager.h" | 37 #include "chrome/browser/profiles/profile_manager.h" |
| 39 #include "chrome/browser/sync/profile_sync_service_factory.h" | 38 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 55 #include "components/password_manager/core/common/password_manager_pref_names.h" | 54 #include "components/password_manager/core/common/password_manager_pref_names.h" |
| 56 #include "components/prefs/pref_service.h" | 55 #include "components/prefs/pref_service.h" |
| 57 #include "components/safe_browsing_db/safe_browsing_prefs.h" | 56 #include "components/safe_browsing_db/safe_browsing_prefs.h" |
| 58 #include "components/signin/core/common/signin_pref_names.h" | 57 #include "components/signin/core/common/signin_pref_names.h" |
| 59 #include "components/strings/grit/components_locale_settings.h" | 58 #include "components/strings/grit/components_locale_settings.h" |
| 60 #include "components/translate/core/browser/translate_prefs.h" | 59 #include "components/translate/core/browser/translate_prefs.h" |
| 61 #include "components/translate/core/common/translate_pref_names.h" | 60 #include "components/translate/core/common/translate_pref_names.h" |
| 62 #include "components/version_info/version_info.h" | 61 #include "components/version_info/version_info.h" |
| 63 #include "components/web_resource/web_resource_pref_names.h" | 62 #include "components/web_resource/web_resource_pref_names.h" |
| 64 #include "content/public/browser/browser_thread.h" | 63 #include "content/public/browser/browser_thread.h" |
| 64 #include "content/public/browser/browsing_data_filter_builder.h" |
| 65 #include "jni/PrefServiceBridge_jni.h" | 65 #include "jni/PrefServiceBridge_jni.h" |
| 66 #include "third_party/icu/source/common/unicode/uloc.h" | 66 #include "third_party/icu/source/common/unicode/uloc.h" |
| 67 #include "ui/base/l10n/l10n_util.h" | 67 #include "ui/base/l10n/l10n_util.h" |
| 68 | 68 |
| 69 using base::android::AttachCurrentThread; | 69 using base::android::AttachCurrentThread; |
| 70 using base::android::CheckException; | 70 using base::android::CheckException; |
| 71 using base::android::ConvertJavaStringToUTF8; | 71 using base::android::ConvertJavaStringToUTF8; |
| 72 using base::android::ConvertUTF8ToJavaString; | 72 using base::android::ConvertUTF8ToJavaString; |
| 73 using base::android::JavaParamRef; | 73 using base::android::JavaParamRef; |
| 74 using base::android::JavaRef; | 74 using base::android::JavaRef; |
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 std::vector<std::string> ignoring_domains; | 651 std::vector<std::string> ignoring_domains; |
| 652 std::vector<int32_t> ignoring_domain_reasons; | 652 std::vector<int32_t> ignoring_domain_reasons; |
| 653 base::android::AppendJavaStringArrayToStringVector( | 653 base::android::AppendJavaStringArrayToStringVector( |
| 654 env, jexcluding_domains.obj(), &excluding_domains); | 654 env, jexcluding_domains.obj(), &excluding_domains); |
| 655 base::android::JavaIntArrayToIntVector(env, jexcluding_domain_reasons.obj(), | 655 base::android::JavaIntArrayToIntVector(env, jexcluding_domain_reasons.obj(), |
| 656 &excluding_domain_reasons); | 656 &excluding_domain_reasons); |
| 657 base::android::AppendJavaStringArrayToStringVector( | 657 base::android::AppendJavaStringArrayToStringVector( |
| 658 env, jignoring_domains.obj(), &ignoring_domains); | 658 env, jignoring_domains.obj(), &ignoring_domains); |
| 659 base::android::JavaIntArrayToIntVector(env, jignoring_domain_reasons.obj(), | 659 base::android::JavaIntArrayToIntVector(env, jignoring_domain_reasons.obj(), |
| 660 &ignoring_domain_reasons); | 660 &ignoring_domain_reasons); |
| 661 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder( | 661 std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder( |
| 662 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); | 662 content::BrowsingDataFilterBuilder::Create( |
| 663 content::BrowsingDataFilterBuilder::BLACKLIST)); |
| 663 for (const std::string& domain : excluding_domains) { | 664 for (const std::string& domain : excluding_domains) { |
| 664 filter_builder->AddRegisterableDomain(domain); | 665 filter_builder->AddRegisterableDomain(domain); |
| 665 } | 666 } |
| 666 | 667 |
| 667 if (!excluding_domains.empty() || !ignoring_domains.empty()) { | 668 if (!excluding_domains.empty() || !ignoring_domains.empty()) { |
| 668 ImportantSitesUtil::RecordBlacklistedAndIgnoredImportantSites( | 669 ImportantSitesUtil::RecordBlacklistedAndIgnoredImportantSites( |
| 669 GetOriginalProfile(), excluding_domains, excluding_domain_reasons, | 670 GetOriginalProfile(), excluding_domains, excluding_domain_reasons, |
| 670 ignoring_domains, ignoring_domain_reasons); | 671 ignoring_domains, ignoring_domain_reasons); |
| 671 } | 672 } |
| 672 | 673 |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1231 | 1232 |
| 1232 return ConvertJavaStringToUTF8(android_permission); | 1233 return ConvertJavaStringToUTF8(android_permission); |
| 1233 } | 1234 } |
| 1234 | 1235 |
| 1235 static void SetSupervisedUserId(JNIEnv* env, | 1236 static void SetSupervisedUserId(JNIEnv* env, |
| 1236 const JavaParamRef<jobject>& obj, | 1237 const JavaParamRef<jobject>& obj, |
| 1237 const JavaParamRef<jstring>& pref) { | 1238 const JavaParamRef<jstring>& pref) { |
| 1238 GetPrefService()->SetString(prefs::kSupervisedUserId, | 1239 GetPrefService()->SetString(prefs::kSupervisedUserId, |
| 1239 ConvertJavaStringToUTF8(env, pref)); | 1240 ConvertJavaStringToUTF8(env, pref)); |
| 1240 } | 1241 } |
| OLD | NEW |