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

Side by Side Diff: chrome/browser/android/browsing_data/browsing_data_bridge.cc

Issue 2816723002: Add "Site Settings" option to Clear Browsing Data on Android (Closed)
Patch Set: fixes Created 3 years, 7 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 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 case browsing_data::BrowsingDataType::PASSWORDS: 122 case browsing_data::BrowsingDataType::PASSWORDS:
123 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS; 123 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS;
124 break; 124 break;
125 case browsing_data::BrowsingDataType::FORM_DATA: 125 case browsing_data::BrowsingDataType::FORM_DATA:
126 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA; 126 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA;
127 break; 127 break;
128 case browsing_data::BrowsingDataType::BOOKMARKS: 128 case browsing_data::BrowsingDataType::BOOKMARKS:
129 // Bookmarks are deleted separately on the Java side. 129 // Bookmarks are deleted separately on the Java side.
130 NOTREACHED(); 130 NOTREACHED();
131 break; 131 break;
132 case browsing_data::BrowsingDataType::SITE_SETTINGS:
133 remove_mask |=
134 ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS;
135 break;
132 case browsing_data::BrowsingDataType::NUM_TYPES: 136 case browsing_data::BrowsingDataType::NUM_TYPES:
133 NOTREACHED(); 137 NOTREACHED();
134 } 138 }
135 } 139 }
136 std::vector<std::string> excluding_domains; 140 std::vector<std::string> excluding_domains;
137 std::vector<int32_t> excluding_domain_reasons; 141 std::vector<int32_t> excluding_domain_reasons;
138 std::vector<std::string> ignoring_domains; 142 std::vector<std::string> ignoring_domains;
139 std::vector<int32_t> ignoring_domain_reasons; 143 std::vector<int32_t> ignoring_domain_reasons;
140 base::android::AppendJavaStringArrayToStringVector( 144 base::android::AppendJavaStringArrayToStringVector(
141 env, jexcluding_domains.obj(), &excluding_domains); 145 env, jexcluding_domains.obj(), &excluding_domains);
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 282
279 static void MarkOriginAsImportantForTesting( 283 static void MarkOriginAsImportantForTesting(
280 JNIEnv* env, 284 JNIEnv* env,
281 const JavaParamRef<jclass>& clazz, 285 const JavaParamRef<jclass>& clazz,
282 const JavaParamRef<jstring>& jorigin) { 286 const JavaParamRef<jstring>& jorigin) {
283 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); 287 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin));
284 CHECK(origin.is_valid()); 288 CHECK(origin.is_valid());
285 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), 289 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(),
286 origin); 290 origin);
287 } 291 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698