| 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 case browsing_data::BrowsingDataType::PASSWORDS: | 124 case browsing_data::BrowsingDataType::PASSWORDS: |
| 125 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS; | 125 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS; |
| 126 break; | 126 break; |
| 127 case browsing_data::BrowsingDataType::FORM_DATA: | 127 case browsing_data::BrowsingDataType::FORM_DATA: |
| 128 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA; | 128 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA; |
| 129 break; | 129 break; |
| 130 case browsing_data::BrowsingDataType::BOOKMARKS: | 130 case browsing_data::BrowsingDataType::BOOKMARKS: |
| 131 // Bookmarks are deleted separately on the Java side. | 131 // Bookmarks are deleted separately on the Java side. |
| 132 NOTREACHED(); | 132 NOTREACHED(); |
| 133 break; | 133 break; |
| 134 case browsing_data::BrowsingDataType::SITE_SETTINGS: |
| 135 remove_mask |= |
| 136 ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS; |
| 137 break; |
| 134 case browsing_data::BrowsingDataType::NUM_TYPES: | 138 case browsing_data::BrowsingDataType::NUM_TYPES: |
| 135 NOTREACHED(); | 139 NOTREACHED(); |
| 136 } | 140 } |
| 137 } | 141 } |
| 138 std::vector<std::string> excluding_domains; | 142 std::vector<std::string> excluding_domains; |
| 139 std::vector<int32_t> excluding_domain_reasons; | 143 std::vector<int32_t> excluding_domain_reasons; |
| 140 std::vector<std::string> ignoring_domains; | 144 std::vector<std::string> ignoring_domains; |
| 141 std::vector<int32_t> ignoring_domain_reasons; | 145 std::vector<int32_t> ignoring_domain_reasons; |
| 142 base::android::AppendJavaStringArrayToStringVector( | 146 base::android::AppendJavaStringArrayToStringVector( |
| 143 env, jexcluding_domains.obj(), &excluding_domains); | 147 env, jexcluding_domains.obj(), &excluding_domains); |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 | 284 |
| 281 static void MarkOriginAsImportantForTesting( | 285 static void MarkOriginAsImportantForTesting( |
| 282 JNIEnv* env, | 286 JNIEnv* env, |
| 283 const JavaParamRef<jclass>& clazz, | 287 const JavaParamRef<jclass>& clazz, |
| 284 const JavaParamRef<jstring>& jorigin) { | 288 const JavaParamRef<jstring>& jorigin) { |
| 285 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); | 289 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); |
| 286 CHECK(origin.is_valid()); | 290 CHECK(origin.is_valid()); |
| 287 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), | 291 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), |
| 288 origin); | 292 origin); |
| 289 } | 293 } |
| OLD | NEW |