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

Unified Diff: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
index dc03b063b5f6179aea108b7572f8d53cb83fddeb..bc7baba7acbecedebeb1d7fe34140a19d8b90853 100644
--- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
@@ -54,22 +54,22 @@ const char kNameOfNewUserParametersScreen[] = "username";
void ConfigureErrorScreen(ErrorScreen* screen,
const NetworkState* network,
- const NetworkPortalDetector::CaptivePortalStatus status) {
+ const captive_portal::CaptivePortalStatus status) {
switch (status) {
- case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
- case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE:
+ case captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN:
+ case captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE:
NOTREACHED();
break;
- case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
+ case captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE:
screen->SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE,
std::string());
break;
- case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:
+ case captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL:
screen->SetErrorState(ErrorScreen::ERROR_STATE_PORTAL,
network ? network->name() : std::string());
screen->FixCaptivePortal();
break;
- case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
+ case captive_portal::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
screen->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,
std::string());
break;
@@ -135,7 +135,7 @@ void LocallyManagedUserCreationScreen::OnPageSelected(const std::string& page) {
void LocallyManagedUserCreationScreen::OnPortalDetectionCompleted(
const NetworkState* network,
const NetworkPortalDetector::CaptivePortalState& state) {
- if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) {
+ if (state.status == captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE) {
get_screen_observer()->HideErrorScreen(this);
} else {
on_error_screen_ = true;

Powered by Google App Engine
This is Rietveld 408576698