| Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.h
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
|
| index 424e516767f21073544df397dcb2e730f8ea38a4..ea7a41ba10d10c6bf87072dcf0843e331a447ce4 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
|
| @@ -46,7 +46,8 @@ namespace base {
|
| class MessageLoop;
|
| }
|
|
|
| -class SafeBrowsingBlockingPage : public SecurityInterstitialPage {
|
| +class SafeBrowsingBlockingPage
|
| + : public SecurityInterstitialPageWithExtendedReporting {
|
| public:
|
| typedef SafeBrowsingUIManager::UnsafeResource UnsafeResource;
|
| typedef std::vector<UnsafeResource> UnsafeResourceList;
|
| @@ -91,7 +92,7 @@ class SafeBrowsingBlockingPage : public SecurityInterstitialPage {
|
| friend class SafeBrowsingBlockingPageTest;
|
| FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
|
| ProceedThenDontProceed);
|
| - void SetReportingPreference(bool report);
|
| +
|
| void UpdateReportingPref(); // Used for the transition from old to new pref.
|
|
|
| // Don't instantiate this class directly, use ShowBlockingPage instead.
|
| @@ -125,10 +126,6 @@ class SafeBrowsingBlockingPage : public SecurityInterstitialPage {
|
| // enabled, the report is scheduled to be sent on the |ui_manager_|.
|
| void FinishMalwareDetails(int64 delay_ms);
|
|
|
| - // Returns the boolean value of the given |pref| from the PrefService of the
|
| - // Profile associated with |web_contents_|.
|
| - bool IsPrefEnabled(const char* pref);
|
| -
|
| // A list of SafeBrowsingUIManager::UnsafeResource for a tab that the user
|
| // should be warned about. They are queued when displaying more than one
|
| // interstitial at a time.
|
| @@ -186,10 +183,12 @@ class SafeBrowsingBlockingPage : public SecurityInterstitialPage {
|
| private:
|
| // Fills the passed dictionary with the values to be passed to the template
|
| // when creating the HTML.
|
| - void PopulateExtendedReportingOption(base::DictionaryValue* load_time_data);
|
| void PopulateMalwareLoadTimeData(base::DictionaryValue* load_time_data);
|
| void PopulateHarmfulLoadTimeData(base::DictionaryValue* load_time_data);
|
| void PopulatePhishingLoadTimeData(base::DictionaryValue* load_time_data);
|
| + // SecurityInterstitialPageWithExtendedReporting implementation:
|
| + void PopulateExtendedReportingOption(
|
| + base::DictionaryValue* load_time_data) override;
|
|
|
| std::string GetMetricPrefix() const;
|
| std::string GetSamplingEventName() const;
|
|
|