diff options
| author | achuith <achuith@chromium.org> | 2015-09-28 14:11:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-28 21:13:06 +0000 |
| commit | 95786022884fbc4f6515956d9b832f455ede019d (patch) | |
| tree | 46c422c6a4c9f5b6e763afac0e13621de2362bff /ui/chromeos | |
| parent | 38d41d3774fb9f74588dc7f23d27613eaf28c864 (diff) | |
| download | chromium_src-95786022884fbc4f6515956d9b832f455ede019d.zip chromium_src-95786022884fbc4f6515956d9b832f455ede019d.tar.gz chromium_src-95786022884fbc4f6515956d9b832f455ede019d.tar.bz2 | |
Introduce namespace network_portal_detector.
* This houses previously static methods of NetworkPortalDetector, such as Get (now GetInstance), IsInitialized, InitializeForTesting, etc.
* InitializeNetworkPortalDetector moved to cbmc
* Number of renames of NetworkPortalDetector:: to network_portal_detector::
Files with non-trivial changes:
network_portal_detector_impl.{cc|h}
network_portal_detector.{cc|h}
chrome_browser_main_chromeos.cc
Everything else is a mechanical search/replace
BUG=530485
TEST=unit tests and browser tests.
TBR=kalman@chromium.org
Review URL: https://codereview.chromium.org/1358343003
Cr-Commit-Position: refs/heads/master@{#351153}
Diffstat (limited to 'ui/chromeos')
| -rw-r--r-- | ui/chromeos/network/network_icon.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/chromeos/network/network_icon.cc b/ui/chromeos/network/network_icon.cc index 97c6261..6f61a00 100644 --- a/ui/chromeos/network/network_icon.cc +++ b/ui/chromeos/network/network_icon.cc @@ -600,9 +600,10 @@ bool NetworkIconImpl::UpdateCellularState(const NetworkState* network) { bool NetworkIconImpl::UpdatePortalState(const NetworkState* network) { bool behind_captive_portal = false; - if (network && NetworkPortalDetector::IsInitialized()) { + if (network && chromeos::network_portal_detector::IsInitialized()) { NetworkPortalDetector::CaptivePortalState state = - NetworkPortalDetector::Get()->GetCaptivePortalState(network->guid()); + chromeos::network_portal_detector::GetInstance()->GetCaptivePortalState( + network->guid()); behind_captive_portal = state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL; } |