chrome/browser/android/preferences/pref_service_bridge.cc - Issue 2230243002: Move remaining clear browsing data util method to components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/preferences/pref_service_bridge.cc

Issue 2230243002: Move remaining clear browsing data util method to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_rest_of_counter_utils

Patch Set: Fixed formatting Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc ('K') | « chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc ('k') | chrome/browser/browsing_data/browsing_data_counter_utils.h » ('j') | components/browsing_data/core/browsing_data_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/preferences/pref_service_bridge.cc

diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc

index c83f95de18782ed07a15a98be04fc04e8b61e026..aa2e60f709ad3ec13815ddd686ea3a8dbf00258b 100644

--- a/chrome/browser/android/preferences/pref_service_bridge.cc

+++ b/chrome/browser/android/preferences/pref_service_bridge.cc

@@ -24,7 +24,6 @@

#include "base/values.h"

#include "chrome/browser/android/preferences/important_sites_util.h"

#include "chrome/browser/browser_process.h"

-#include "chrome/browser/browsing_data/browsing_data_counter_utils.h"

#include "chrome/browser/browsing_data/browsing_data_filter_builder.h"

#include "chrome/browser/browsing_data/browsing_data_helper.h"

#include "chrome/browser/browsing_data/browsing_data_remover.h"

@@ -556,7 +555,7 @@ static jboolean GetBrowsingDataDeletionPreference(

// TODO(msramek): Consider defining native-side preferences for all Java UI

// data types for consistency.

std::string pref;

- if (!GetDeletionPreferenceFromDataType(

+ if (!browsing_data::GetDeletionPreferenceFromDataType(

static_cast<browsing_data::BrowsingDataType>(data_type), &pref)) {

return false;

}

@@ -573,7 +572,7 @@ static void SetBrowsingDataDeletionPreference(

DCHECK_LT(data_type, browsing_data::NUM_TYPES);

std::string pref;

- if (!GetDeletionPreferenceFromDataType(

+ if (!browsing_data::GetDeletionPreferenceFromDataType(

static_cast<browsing_data::BrowsingDataType>(data_type), &pref)) {

return;

}