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 11 matching lines...) Expand all Loading... |
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_helper.h" | 29 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
30 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 30 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
31 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" | 31 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
| 32 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
32 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 33 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
33 #include "chrome/browser/engagement/important_sites_util.h" | 34 #include "chrome/browser/engagement/important_sites_util.h" |
34 #include "chrome/browser/history/web_history_service_factory.h" | 35 #include "chrome/browser/history/web_history_service_factory.h" |
35 #include "chrome/browser/net/prediction_options.h" | 36 #include "chrome/browser/net/prediction_options.h" |
36 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 37 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
37 #include "chrome/browser/profiles/profile_manager.h" | 38 #include "chrome/browser/profiles/profile_manager.h" |
38 #include "chrome/browser/sync/profile_sync_service_factory.h" | 39 #include "chrome/browser/sync/profile_sync_service_factory.h" |
39 #include "chrome/browser/translate/chrome_translate_client.h" | 40 #include "chrome/browser/translate/chrome_translate_client.h" |
40 #include "chrome/browser/ui/android/android_about_app_info.h" | 41 #include "chrome/browser/ui/android/android_about_app_info.h" |
41 #include "chrome/common/channel_info.h" | 42 #include "chrome/common/channel_info.h" |
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 BrowsingDataRemover* browsing_data_remover = | 647 BrowsingDataRemover* browsing_data_remover = |
647 BrowsingDataRemoverFactory::GetForBrowserContext(GetOriginalProfile()); | 648 BrowsingDataRemoverFactory::GetForBrowserContext(GetOriginalProfile()); |
648 | 649 |
649 std::vector<int> data_types_vector; | 650 std::vector<int> data_types_vector; |
650 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); | 651 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); |
651 | 652 |
652 int remove_mask = 0; | 653 int remove_mask = 0; |
653 for (const int data_type : data_types_vector) { | 654 for (const int data_type : data_types_vector) { |
654 switch (static_cast<browsing_data::BrowsingDataType>(data_type)) { | 655 switch (static_cast<browsing_data::BrowsingDataType>(data_type)) { |
655 case browsing_data::BrowsingDataType::HISTORY: | 656 case browsing_data::BrowsingDataType::HISTORY: |
656 remove_mask |= BrowsingDataRemover::REMOVE_HISTORY; | 657 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY; |
657 break; | 658 break; |
658 case browsing_data::BrowsingDataType::CACHE: | 659 case browsing_data::BrowsingDataType::CACHE: |
659 remove_mask |= BrowsingDataRemover::REMOVE_CACHE; | 660 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE; |
660 break; | 661 break; |
661 case browsing_data::BrowsingDataType::COOKIES: | 662 case browsing_data::BrowsingDataType::COOKIES: |
662 remove_mask |= BrowsingDataRemover::REMOVE_COOKIES; | 663 remove_mask |= BrowsingDataRemover::DATA_TYPE_COOKIES; |
663 remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA; | 664 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA; |
664 break; | 665 break; |
665 case browsing_data::BrowsingDataType::PASSWORDS: | 666 case browsing_data::BrowsingDataType::PASSWORDS: |
666 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS; | 667 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS; |
667 break; | 668 break; |
668 case browsing_data::BrowsingDataType::FORM_DATA: | 669 case browsing_data::BrowsingDataType::FORM_DATA: |
669 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA; | 670 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA; |
670 break; | 671 break; |
671 case browsing_data::BrowsingDataType::BOOKMARKS: | 672 case browsing_data::BrowsingDataType::BOOKMARKS: |
672 // Bookmarks are deleted separately on the Java side. | 673 // Bookmarks are deleted separately on the Java side. |
673 NOTREACHED(); | 674 NOTREACHED(); |
674 break; | 675 break; |
675 case browsing_data::BrowsingDataType::NUM_TYPES: | 676 case browsing_data::BrowsingDataType::NUM_TYPES: |
676 NOTREACHED(); | 677 NOTREACHED(); |
677 } | 678 } |
678 } | 679 } |
679 std::vector<std::string> excluding_domains; | 680 std::vector<std::string> excluding_domains; |
(...skipping 17 matching lines...) Expand all Loading... |
697 | 698 |
698 if (!excluding_domains.empty() || !ignoring_domains.empty()) { | 699 if (!excluding_domains.empty() || !ignoring_domains.empty()) { |
699 ImportantSitesUtil::RecordBlacklistedAndIgnoredImportantSites( | 700 ImportantSitesUtil::RecordBlacklistedAndIgnoredImportantSites( |
700 GetOriginalProfile(), excluding_domains, excluding_domain_reasons, | 701 GetOriginalProfile(), excluding_domains, excluding_domain_reasons, |
701 ignoring_domains, ignoring_domain_reasons); | 702 ignoring_domains, ignoring_domain_reasons); |
702 } | 703 } |
703 | 704 |
704 // Delete the types protected by Important Sites with a filter, | 705 // Delete the types protected by Important Sites with a filter, |
705 // and the rest completely. | 706 // and the rest completely. |
706 int filterable_mask = | 707 int filterable_mask = |
707 remove_mask & BrowsingDataRemover::IMPORTANT_SITES_DATATYPES; | 708 remove_mask & |
708 int nonfilterable_mask = remove_mask & | 709 ChromeBrowsingDataRemoverDelegate::IMPORTANT_SITES_DATA_TYPES; |
709 ~BrowsingDataRemover::IMPORTANT_SITES_DATATYPES; | 710 int nonfilterable_mask = |
| 711 remove_mask & |
| 712 ~ChromeBrowsingDataRemoverDelegate::IMPORTANT_SITES_DATA_TYPES; |
710 | 713 |
711 // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is | 714 // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is |
712 // done with both removal tasks. | 715 // done with both removal tasks. |
713 ClearBrowsingDataObserver* observer = new ClearBrowsingDataObserver( | 716 ClearBrowsingDataObserver* observer = new ClearBrowsingDataObserver( |
714 env, obj, browsing_data_remover, 2 /* tasks_count */); | 717 env, obj, browsing_data_remover, 2 /* tasks_count */); |
715 | 718 |
716 browsing_data::TimePeriod period = | 719 browsing_data::TimePeriod period = |
717 static_cast<browsing_data::TimePeriod>(time_period); | 720 static_cast<browsing_data::TimePeriod>(time_period); |
718 browsing_data::RecordDeletionForPeriod(period); | 721 browsing_data::RecordDeletionForPeriod(period); |
719 | 722 |
720 if (filterable_mask) { | 723 if (filterable_mask) { |
721 browsing_data_remover->RemoveWithFilterAndReply( | 724 browsing_data_remover->RemoveWithFilterAndReply( |
722 browsing_data::CalculateBeginDeleteTime(period), | 725 browsing_data::CalculateBeginDeleteTime(period), |
723 browsing_data::CalculateEndDeleteTime(period), | 726 browsing_data::CalculateEndDeleteTime(period), filterable_mask, |
724 filterable_mask, BrowsingDataHelper::UNPROTECTED_WEB, | 727 BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB, |
725 std::move(filter_builder), observer); | 728 std::move(filter_builder), observer); |
726 } else { | 729 } else { |
727 // Make sure |observer| doesn't wait for the filtered task. | 730 // Make sure |observer| doesn't wait for the filtered task. |
728 observer->OnBrowsingDataRemoverDone(); | 731 observer->OnBrowsingDataRemoverDone(); |
729 } | 732 } |
730 | 733 |
731 if (nonfilterable_mask) { | 734 if (nonfilterable_mask) { |
732 browsing_data_remover->RemoveAndReply( | 735 browsing_data_remover->RemoveAndReply( |
733 browsing_data::CalculateBeginDeleteTime(period), | 736 browsing_data::CalculateBeginDeleteTime(period), |
734 browsing_data::CalculateEndDeleteTime(period), | 737 browsing_data::CalculateEndDeleteTime(period), nonfilterable_mask, |
735 nonfilterable_mask, BrowsingDataHelper::UNPROTECTED_WEB, observer); | 738 BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB, observer); |
736 } else { | 739 } else { |
737 // Make sure |observer| doesn't wait for the non-filtered task. | 740 // Make sure |observer| doesn't wait for the non-filtered task. |
738 observer->OnBrowsingDataRemoverDone(); | 741 observer->OnBrowsingDataRemoverDone(); |
739 } | 742 } |
740 } | 743 } |
741 | 744 |
742 static jboolean CanDeleteBrowsingHistory(JNIEnv* env, | 745 static jboolean CanDeleteBrowsingHistory(JNIEnv* env, |
743 const JavaParamRef<jobject>& obj) { | 746 const JavaParamRef<jobject>& obj) { |
744 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory); | 747 return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory); |
745 } | 748 } |
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1263 .obj(), | 1266 .obj(), |
1264 out); | 1267 out); |
1265 } | 1268 } |
1266 | 1269 |
1267 static void SetSupervisedUserId(JNIEnv* env, | 1270 static void SetSupervisedUserId(JNIEnv* env, |
1268 const JavaParamRef<jobject>& obj, | 1271 const JavaParamRef<jobject>& obj, |
1269 const JavaParamRef<jstring>& pref) { | 1272 const JavaParamRef<jstring>& pref) { |
1270 GetPrefService()->SetString(prefs::kSupervisedUserId, | 1273 GetPrefService()->SetString(prefs::kSupervisedUserId, |
1271 ConvertJavaStringToUTF8(env, pref)); | 1274 ConvertJavaStringToUTF8(env, pref)); |
1272 } | 1275 } |
OLD | NEW |