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

Unified Diff: chrome/browser/chromeos/net/network_portal_detector_impl.cc

Issue 1353933002: NetworkPortalDetectorInterface class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@portal_refactor
Patch Set: rebase Created 5 years, 3 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
Index: chrome/browser/chromeos/net/network_portal_detector_impl.cc
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.cc b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
index 7f717b2a1148a0c7c08c9d35b7ffb8a5874108ef..815fad974ad60e0c8829e8fd02872dc1cfcefb2e 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
@@ -141,6 +141,32 @@ void RecordPortalToOnlineTransition(const base::TimeDelta& duration) {
}
}
+class NetworkPortalDetectorStubImpl : public NetworkPortalDetectorInterface {
+ public:
+ NetworkPortalDetectorStubImpl() {}
+ ~NetworkPortalDetectorStubImpl() override {}
+
+ private:
+ // NetworkPortalDetector:
+ void AddObserver(Observer* observer) override {}
+ void AddAndFireObserver(Observer* observer) override {
+ if (observer)
+ observer->OnPortalDetectionCompleted(nullptr, CaptivePortalState());
+ }
+ void RemoveObserver(Observer* observer) override {}
+ CaptivePortalState GetCaptivePortalState(
+ const std::string& service_path) override {
+ return CaptivePortalState();
+ }
+ bool IsEnabled() override { return false; }
+ void Enable(bool start_detection) override {}
+ bool StartDetectionIfIdle() override { return false; }
+ void SetStrategy(PortalDetectorStrategy::StrategyId id) override {}
+ void OnLockScreenRequest() override {}
+
+ DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorStubImpl);
+};
+
} // namespace
////////////////////////////////////////////////////////////////////////////////
@@ -208,19 +234,19 @@ const char NetworkPortalDetectorImpl::kSessionShillOfflineHistogram[] =
const char NetworkPortalDetectorImpl::kSessionPortalToOnlineHistogram[] =
"CaptivePortal.Session.PortalToOnlineTransition";
-// static
-void NetworkPortalDetectorImpl::Initialize(
+void InitializeNetworkPortalDetector(
net::URLRequestContextGetter* url_context) {
- if (set_for_testing())
+ if (NetworkPortalDetector::set_for_testing())
return;
- CHECK(!network_portal_detector())
+ CHECK(!NetworkPortalDetector::network_portal_detector())
<< "NetworkPortalDetector was initialized twice.";
NET_LOG(EVENT) << "NetworkPortalDetectorImpl::Initialize";
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
::switches::kTestType)) {
- set_network_portal_detector(new NetworkPortalDetectorStub());
+ NetworkPortalDetector::set_network_portal_detector(
+ new NetworkPortalDetectorStub());
} else {
- set_network_portal_detector(
+ NetworkPortalDetector::set_network_portal_detector(
new NetworkPortalDetectorImpl(url_context, true));
}
}

Powered by Google App Engine
This is Rietveld 408576698