| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/browsing_data/browsing_data_bridge.h" | 5 #include "chrome/browser/android/browsing_data/browsing_data_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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 const JavaParamRef<jobjectArray>& jexcluding_domains, | 74 const JavaParamRef<jobjectArray>& jexcluding_domains, |
| 75 const JavaParamRef<jintArray>& jexcluding_domain_reasons, | 75 const JavaParamRef<jintArray>& jexcluding_domain_reasons, |
| 76 const JavaParamRef<jobjectArray>& jignoring_domains, | 76 const JavaParamRef<jobjectArray>& jignoring_domains, |
| 77 const JavaParamRef<jintArray>& jignoring_domain_reasons) { | 77 const JavaParamRef<jintArray>& jignoring_domain_reasons) { |
| 78 BrowsingDataRemover* browsing_data_remover = | 78 BrowsingDataRemover* browsing_data_remover = |
| 79 content::BrowserContext::GetBrowsingDataRemover(GetOriginalProfile()); | 79 content::BrowserContext::GetBrowsingDataRemover(GetOriginalProfile()); |
| 80 | 80 |
| 81 std::vector<int> data_types_vector; | 81 std::vector<int> data_types_vector; |
| 82 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); | 82 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); |
| 83 | 83 |
| 84 if (base::FeatureList::IsEnabled(features::kTabsInCbd)) { | |
| 85 int tab = GetOriginalProfile()->GetPrefs()->GetInteger( | |
| 86 browsing_data::prefs::kLastClearBrowsingDataTab); | |
| 87 browsing_data::RecordDeletionFromTab( | |
| 88 static_cast<browsing_data::ClearBrowsingDataTab>(tab)); | |
| 89 } | |
| 90 | |
| 91 int remove_mask = 0; | 84 int remove_mask = 0; |
| 92 for (const int data_type : data_types_vector) { | 85 for (const int data_type : data_types_vector) { |
| 93 switch (static_cast<browsing_data::BrowsingDataType>(data_type)) { | 86 switch (static_cast<browsing_data::BrowsingDataType>(data_type)) { |
| 94 case browsing_data::BrowsingDataType::HISTORY: | 87 case browsing_data::BrowsingDataType::HISTORY: |
| 95 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY; | 88 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY; |
| 96 break; | 89 break; |
| 97 case browsing_data::BrowsingDataType::CACHE: | 90 case browsing_data::BrowsingDataType::CACHE: |
| 98 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE; | 91 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE; |
| 99 break; | 92 break; |
| 100 case browsing_data::BrowsingDataType::COOKIES: | 93 case browsing_data::BrowsingDataType::COOKIES: |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 | 228 |
| 236 static void MarkOriginAsImportantForTesting( | 229 static void MarkOriginAsImportantForTesting( |
| 237 JNIEnv* env, | 230 JNIEnv* env, |
| 238 const JavaParamRef<jclass>& clazz, | 231 const JavaParamRef<jclass>& clazz, |
| 239 const JavaParamRef<jstring>& jorigin) { | 232 const JavaParamRef<jstring>& jorigin) { |
| 240 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); | 233 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); |
| 241 CHECK(origin.is_valid()); | 234 CHECK(origin.is_valid()); |
| 242 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), | 235 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), |
| 243 origin); | 236 origin); |
| 244 } | 237 } |
| OLD | NEW |