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

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

Issue 2927063002: Add metrics for new CBD dialog (Closed)
Patch Set: Update migration comment (and rebase) Created 3 years, 6 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>
11 #include <set> 11 #include <set>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/android/jni_android.h" 15 #include "base/android/jni_android.h"
16 #include "base/android/jni_array.h" 16 #include "base/android/jni_array.h"
17 #include "base/android/jni_string.h" 17 #include "base/android/jni_string.h"
18 #include "base/android/jni_weak_ref.h" 18 #include "base/android/jni_weak_ref.h"
19 #include "base/feature_list.h"
19 #include "base/metrics/histogram_macros.h" 20 #include "base/metrics/histogram_macros.h"
20 #include "base/scoped_observer.h" 21 #include "base/scoped_observer.h"
21 #include "base/values.h" 22 #include "base/values.h"
22 #include "chrome/browser/browsing_data/browsing_data_important_sites_util.h" 23 #include "chrome/browser/browsing_data/browsing_data_important_sites_util.h"
23 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" 24 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
24 #include "chrome/browser/engagement/important_sites_util.h" 25 #include "chrome/browser/engagement/important_sites_util.h"
25 #include "chrome/browser/history/web_history_service_factory.h" 26 #include "chrome/browser/history/web_history_service_factory.h"
26 #include "chrome/browser/profiles/profile_manager.h" 27 #include "chrome/browser/profiles/profile_manager.h"
27 #include "chrome/browser/sync/profile_sync_service_factory.h" 28 #include "chrome/browser/sync/profile_sync_service_factory.h"
28 #include "chrome/common/channel_info.h" 29 #include "chrome/common/channel_info.h"
30 #include "chrome/common/chrome_features.h"
29 #include "components/browser_sync/profile_sync_service.h" 31 #include "components/browser_sync/profile_sync_service.h"
30 #include "components/browsing_data/core/history_notice_utils.h" 32 #include "components/browsing_data/core/history_notice_utils.h"
33 #include "components/browsing_data/core/pref_names.h"
31 #include "components/prefs/pref_service.h" 34 #include "components/prefs/pref_service.h"
32 #include "content/public/browser/browser_context.h" 35 #include "content/public/browser/browser_context.h"
33 #include "content/public/browser/browsing_data_filter_builder.h" 36 #include "content/public/browser/browsing_data_filter_builder.h"
34 #include "content/public/browser/browsing_data_remover.h" 37 #include "content/public/browser/browsing_data_remover.h"
35 #include "jni/BrowsingDataBridge_jni.h" 38 #include "jni/BrowsingDataBridge_jni.h"
36 39
37 using base::android::AttachCurrentThread; 40 using base::android::AttachCurrentThread;
38 using base::android::JavaParamRef; 41 using base::android::JavaParamRef;
39 using base::android::JavaRef; 42 using base::android::JavaRef;
40 using base::android::ScopedJavaLocalRef; 43 using base::android::ScopedJavaLocalRef;
(...skipping 30 matching lines...) Expand all
71 const JavaParamRef<jobjectArray>& jexcluding_domains, 74 const JavaParamRef<jobjectArray>& jexcluding_domains,
72 const JavaParamRef<jintArray>& jexcluding_domain_reasons, 75 const JavaParamRef<jintArray>& jexcluding_domain_reasons,
73 const JavaParamRef<jobjectArray>& jignoring_domains, 76 const JavaParamRef<jobjectArray>& jignoring_domains,
74 const JavaParamRef<jintArray>& jignoring_domain_reasons) { 77 const JavaParamRef<jintArray>& jignoring_domain_reasons) {
75 BrowsingDataRemover* browsing_data_remover = 78 BrowsingDataRemover* browsing_data_remover =
76 content::BrowserContext::GetBrowsingDataRemover(GetOriginalProfile()); 79 content::BrowserContext::GetBrowsingDataRemover(GetOriginalProfile());
77 80
78 std::vector<int> data_types_vector; 81 std::vector<int> data_types_vector;
79 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); 82 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector);
80 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
81 int remove_mask = 0; 91 int remove_mask = 0;
82 for (const int data_type : data_types_vector) { 92 for (const int data_type : data_types_vector) {
83 switch (static_cast<browsing_data::BrowsingDataType>(data_type)) { 93 switch (static_cast<browsing_data::BrowsingDataType>(data_type)) {
84 case browsing_data::BrowsingDataType::HISTORY: 94 case browsing_data::BrowsingDataType::HISTORY:
85 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY; 95 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY;
86 break; 96 break;
87 case browsing_data::BrowsingDataType::CACHE: 97 case browsing_data::BrowsingDataType::CACHE:
88 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE; 98 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE;
89 break; 99 break;
90 case browsing_data::BrowsingDataType::COOKIES: 100 case browsing_data::BrowsingDataType::COOKIES:
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 235
226 static void MarkOriginAsImportantForTesting( 236 static void MarkOriginAsImportantForTesting(
227 JNIEnv* env, 237 JNIEnv* env,
228 const JavaParamRef<jclass>& clazz, 238 const JavaParamRef<jclass>& clazz,
229 const JavaParamRef<jstring>& jorigin) { 239 const JavaParamRef<jstring>& jorigin) {
230 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); 240 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin));
231 CHECK(origin.is_valid()); 241 CHECK(origin.is_valid());
232 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), 242 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(),
233 origin); 243 origin);
234 } 244 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698