OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/net/delay_network_call.h" | 5 #include "chrome/browser/chromeos/net/delay_network_call.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "chromeos/network/network_handler.h" | 9 #include "chromeos/network/network_handler.h" |
10 #include "chromeos/network/network_state.h" | 10 #include "chromeos/network/network_state.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 } else { | 26 } else { |
27 std:: string default_connection_state = default_network->connection_state(); | 27 std:: string default_connection_state = default_network->connection_state(); |
28 if (!NetworkState::StateIsConnected(default_connection_state)) { | 28 if (!NetworkState::StateIsConnected(default_connection_state)) { |
29 delay_network_call = true; | 29 delay_network_call = true; |
30 DVLOG(1) << "DelayNetworkCall: " | 30 DVLOG(1) << "DelayNetworkCall: " |
31 << "Default network: " << default_network->name() | 31 << "Default network: " << default_network->name() |
32 << " State: " << default_connection_state; | 32 << " State: " << default_connection_state; |
33 } | 33 } |
34 } | 34 } |
35 if (!delay_network_call && NetworkPortalDetector::IsInitialized()) { | 35 if (!delay_network_call && NetworkPortalDetector::IsInitialized()) { |
36 NetworkPortalDetector* detector = NetworkPortalDetector::Get(); | |
37 NetworkPortalDetector::CaptivePortalStatus status = | 36 NetworkPortalDetector::CaptivePortalStatus status = |
38 detector->GetCaptivePortalState(default_network->guid()).status; | 37 NetworkPortalDetector::Get() |
| 38 ->GetCaptivePortalState(default_network->guid()) |
| 39 .status; |
39 if (status != NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) { | 40 if (status != NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) { |
40 delay_network_call = true; | 41 delay_network_call = true; |
41 DVLOG(1) << "DelayNetworkCall: Captive portal status for " | 42 DVLOG(1) << "DelayNetworkCall: Captive portal status for " |
42 << default_network->name() << ": " | 43 << default_network->name() << ": " |
43 << NetworkPortalDetector::CaptivePortalStatusString(status); | 44 << NetworkPortalDetector::CaptivePortalStatusString(status); |
44 } | 45 } |
45 } | 46 } |
46 if (delay_network_call) { | 47 if (delay_network_call) { |
47 content::BrowserThread::PostDelayedTask( | 48 content::BrowserThread::PostDelayedTask( |
48 content::BrowserThread::UI, FROM_HERE, | 49 content::BrowserThread::UI, FROM_HERE, |
49 base::Bind(&chromeos::DelayNetworkCall, retry, callback), retry); | 50 base::Bind(&chromeos::DelayNetworkCall, retry, callback), retry); |
50 } else { | 51 } else { |
51 callback.Run(); | 52 callback.Run(); |
52 } | 53 } |
53 } | 54 } |
OLD | NEW |