chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move CaptivePortalDetector to a component Created 6 years, 8 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:

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

index 13c1084415c4e8e9ab9923c3a8a94a68cc6f2065..5e966eb552802ba9ee4958f61e87855dc4d0981c 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -908,7 +908,7 @@ bool SystemTrayDelegateChromeOS::IsNetworkBehindCaptivePortal(

const std::string& service_path) const {

NetworkPortalDetector::CaptivePortalState state =

NetworkPortalDetector::Get()->GetCaptivePortalState(service_path);

- return state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;

+ return state.status == captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;

}

bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() {