chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.h - 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/chromeos/login/enrollment/auto_enrollment_check_step.h

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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/captive_portal/captive_portal_service.cc ('K') | « chrome/browser/chromeos/login/captive_portal_window_browsertest.cc ('k') | chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.cc » ('j') | components/captive_portal/captive_portal_detector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.h

diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.h b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.h

index baa3931735a6afd3118e04997fbc695b54444c5f..428e479225aa948c2a14ec51494e77a4f3c2d078 100644

--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.h

+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.h

@@ -42,13 +42,13 @@ class AutoEnrollmentCheckStep : NetworkPortalDetector::Observer {

// Handles a state update, updating the UI and saving the state.

void UpdateState(

- NetworkPortalDetector::CaptivePortalStatus new_captive_portal_status,

+ captive_portal::CaptivePortalStatus new_captive_portal_status,

policy::AutoEnrollmentState new_auto_enrollment_state);

// Configures the UI to reflect |new_captive_portal_status|. Returns true if

// and only if a UI change has been made.

bool UpdateCaptivePortalStatus(

- NetworkPortalDetector::CaptivePortalStatus new_captive_portal_status);

+ captive_portal::CaptivePortalStatus new_captive_portal_status);

// Configures the UI to reflect |auto_enrollment_state|. Returns true if and

// only if a UI change has been made.

@@ -68,7 +68,7 @@ class AutoEnrollmentCheckStep : NetworkPortalDetector::Observer {

scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>

auto_enrollment_progress_subscription_;

- NetworkPortalDetector::CaptivePortalStatus captive_portal_status_;

+ captive_portal::CaptivePortalStatus captive_portal_status_;

policy::AutoEnrollmentState auto_enrollment_state_;

DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckStep);