diff options
| author | Daniel Cheng <dcheng@chromium.org> | 2015-09-28 16:57:48 -0700 |
|---|---|---|
| committer | Daniel Cheng <dcheng@chromium.org> | 2015-09-29 00:00:02 +0000 |
| commit | cf0aab068e9e8d22f9dae6d1242a66649a34d06c (patch) | |
| tree | 4f1b8f4b5fd585ae09b320ed01ad108d371283cf /components/security_interstitials | |
| parent | 962a062dfc3f632fa460a0623ade6f6ea9763270 (diff) | |
| download | chromium_src-cf0aab068e9e8d22f9dae6d1242a66649a34d06c.zip chromium_src-cf0aab068e9e8d22f9dae6d1242a66649a34d06c.tar.gz chromium_src-cf0aab068e9e8d22f9dae6d1242a66649a34d06c.tar.bz2 | |
Revert "Split captive portal metrics out of SSLErrorClassification"
The Android clang trybots aren't happy with this change:
In file included from
../../chrome/browser/ssl/captive_portal_metrics_recorder.cc:5:
../../chrome/browser/ssl/captive_portal_metrics_recorder.h:42:8: error: private
field 'overridable_' is not used [-Werror,-Wunused-private-field]
bool overridable_;
^
../../chrome/browser/ssl/captive_portal_metrics_recorder.h:43:8: error: private
field 'captive_portal_detection_enabled_' is not used
[-Werror,-Wunused-private-field]
bool captive_portal_detection_enabled_;
^
../../chrome/browser/ssl/captive_portal_metrics_recorder.h:45:8: error: private
field 'captive_portal_probe_completed_' is not used
[-Werror,-Wunused-private-field]
bool captive_portal_probe_completed_;
^
../../chrome/browser/ssl/captive_portal_metrics_recorder.h:47:8: error: private
field 'captive_portal_no_response_' is not used [-Werror,-Wunused-private-field]
bool captive_portal_no_response_;
^
../../chrome/browser/ssl/captive_portal_metrics_recorder.h:48:8: error: private
field 'captive_portal_detected_' is not used [-Werror,-Wunused-private-field]
bool captive_portal_detected_;
^
5 errors generated.
BUG=488673
TBR=felt@chromium.org
Review URL: https://codereview.chromium.org/1373123003 .
Cr-Commit-Position: refs/heads/master@{#351209}
Diffstat (limited to 'components/security_interstitials')
| -rw-r--r-- | components/security_interstitials/core/metrics_helper.cc | 4 | ||||
| -rw-r--r-- | components/security_interstitials/core/metrics_helper.h | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/components/security_interstitials/core/metrics_helper.cc b/components/security_interstitials/core/metrics_helper.cc index 7466562..da7002b 100644 --- a/components/security_interstitials/core/metrics_helper.cc +++ b/components/security_interstitials/core/metrics_helper.cc @@ -134,10 +134,6 @@ void MetricsHelper::RecordUserInteraction(Interaction interaction) { RecordExtraUserInteractionMetrics(interaction); } -void MetricsHelper::RecordShutdownMetrics() { - RecordExtraShutdownMetrics(); -} - int MetricsHelper::NumVisits() { return num_visits_; } diff --git a/components/security_interstitials/core/metrics_helper.h b/components/security_interstitials/core/metrics_helper.h index e610201..064a180 100644 --- a/components/security_interstitials/core/metrics_helper.h +++ b/components/security_interstitials/core/metrics_helper.h @@ -91,17 +91,14 @@ class MetricsHelper { // histogram and potentially in a RAPPOR metric. void RecordUserDecision(Decision decision); void RecordUserInteraction(Interaction interaction); - void RecordShutdownMetrics(); - // Number of times user visited this origin before. -1 means not-yet-set. int NumVisits(); protected: // Subclasses should implement any embedder-specific recording logic in these - // methods. They'll be invoked from the matching Record methods. + // methods. They'll be invoked from RecordUserDecision/Interaction. virtual void RecordExtraUserDecisionMetrics(Decision decision) = 0; virtual void RecordExtraUserInteractionMetrics(Interaction interaction) = 0; - virtual void RecordExtraShutdownMetrics() = 0; private: // Used to query the HistoryService to see if the URL is in history. It will |