| Index: chrome/browser/browsing_data/browsing_data_counter_utils.h
|
| diff --git a/chrome/browser/browsing_data/browsing_data_counter_utils.h b/chrome/browser/browsing_data/browsing_data_counter_utils.h
|
| index d71d24b30e1323767b02ad1356d078dfca5b7998..d00a1ef1f6ae3a944ce98a578d9f26154fa8885d 100644
|
| --- a/chrome/browser/browsing_data/browsing_data_counter_utils.h
|
| +++ b/chrome/browser/browsing_data/browsing_data_counter_utils.h
|
| @@ -6,38 +6,28 @@
|
| #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COUNTER_UTILS_H_
|
|
|
| #include "base/strings/string16.h"
|
| -#include "chrome/browser/browsing_data/browsing_data_counter.h"
|
| +#include "components/browsing_data/browsing_data_utils.h"
|
| +#include "components/browsing_data/counters/browsing_data_counter.h"
|
| +
|
| +class Profile;
|
|
|
| // Whether the browsing data counters experiment is enabled.
|
| bool AreCountersEnabled();
|
|
|
| // Constructs the text to be displayed by a counter from the given |result|.
|
| base::string16 GetCounterTextFromResult(
|
| - const BrowsingDataCounter::Result* result);
|
| -
|
| -// Browsing data types as seen in the Android UI.
|
| -// TODO(msramek): Reuse this enum as the canonical representation of the
|
| -// user-facing browsing data types in the Desktop UI as well.
|
| -//
|
| -// A Java counterpart will be generated for this enum.
|
| -// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
|
| -enum BrowsingDataType {
|
| - HISTORY,
|
| - CACHE,
|
| - COOKIES,
|
| - PASSWORDS,
|
| - FORM_DATA,
|
| - BOOKMARKS,
|
| - NUM_TYPES
|
| -};
|
| + const browsing_data::BrowsingDataCounter::Result* result);
|
|
|
| // Copies the name of the deletion preference corresponding to the given
|
| // |data_type| to |out_pref|. Returns false if no such preference exists.
|
| bool GetDeletionPreferenceFromDataType(
|
| - BrowsingDataType data_type, std::string* out_pref);
|
| + browsing_data::BrowsingDataType data_type,
|
| + std::string* out_pref);
|
|
|
| // Creates a new instance of BrowsingDataCounter that is counting the data
|
| // related to a given deletion preference |pref_name|.
|
| -BrowsingDataCounter* CreateCounterForPreference(std::string pref_name);
|
| +browsing_data::BrowsingDataCounter* CreateCounterForPreference(
|
| + std::string pref_name,
|
| + Profile* profile);
|
|
|
| #endif // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COUNTER_UTILS_H_
|
|
|