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

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

Issue 22364005: Added stub portalled wifi network. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | chromeos/dbus/shill_service_client_stub.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5a1bbef56d3602e915d5078cfdb728269f82a12f..c80e4244772a763d3192b12d1f56846332c2eb0a 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
@@ -11,6 +11,8 @@
#include "base/metrics/histogram.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
+#include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/shill_service_client_stub.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
#include "content/public/browser/notification_service.h"
@@ -352,6 +354,16 @@ void NetworkPortalDetectorImpl::CancelPortalDetection() {
void NetworkPortalDetectorImpl::OnPortalDetectionCompleted(
const CaptivePortalDetector::Results& results) {
+ captive_portal::Result result = results.result;
+ int response_code = results.response_code;
+
+ if (CommandLine::ForCurrentProcess() ->
+ HasSwitch(chromeos::switches::kEnableStubPortalledWifi) &&
+ default_service_path_ == ShillServiceClientStub::kStubPortalledWifiPath) {
+ result = captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL;
+ response_code = 200;
+ }
+
DCHECK(CalledOnValidThread());
DCHECK(IsCheckingForPortal());
@@ -368,8 +380,8 @@ void NetworkPortalDetectorImpl::OnPortalDetectionCompleted(
NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
CaptivePortalState state;
- state.response_code = results.response_code;
- switch (results.result) {
+ state.response_code = response_code;
+ switch (result) {
case captive_portal::RESULT_NO_RESPONSE:
if (attempt_count_ >= kMaxRequestAttempts) {
if (state.response_code == net::HTTP_PROXY_AUTHENTICATION_REQUIRED) {
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | chromeos/dbus/shill_service_client_stub.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698