Index: chrome/browser/chromeos/login/screens/network_error.cc |
diff --git a/chrome/browser/chromeos/login/screens/error_screen_actor.cc b/chrome/browser/chromeos/login/screens/network_error.cc |
similarity index 55% |
copy from chrome/browser/chromeos/login/screens/error_screen_actor.cc |
copy to chrome/browser/chromeos/login/screens/network_error.cc |
index 67aec5b445f294ff7620909f06106564f423b311..df36c5a0881ca52c0edfbf49ff311ce8b1b953e2 100644 |
--- a/chrome/browser/chromeos/login/screens/error_screen_actor.cc |
+++ b/chrome/browser/chromeos/login/screens/network_error.cc |
@@ -2,7 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/chromeos/login/screens/error_screen_actor.h" |
+#include "chrome/browser/chromeos/login/screens/network_error.h" |
+ |
+#include "base/logging.h" |
namespace chromeos { |
@@ -20,40 +22,30 @@ const char kErrorReasonFrameError[] = "frame error"; |
} // namespace |
-ErrorScreenActor::ErrorScreenActor() |
- : ui_state_(ErrorScreen::UI_STATE_UNKNOWN), |
- error_state_(ErrorScreen::ERROR_STATE_UNKNOWN), |
- guest_signin_allowed_(false), |
- offline_login_allowed_(false), |
- show_connecting_indicator_(false), |
- parent_screen_(OobeUI::SCREEN_UNKNOWN) {} |
- |
-ErrorScreenActor::~ErrorScreenActor() {} |
- |
// static |
-const char* ErrorScreenActor::ErrorReasonString(ErrorReason reason) { |
+const char* NetworkError::ErrorReasonString(ErrorReason reason) { |
switch (reason) { |
- case ErrorScreenActor::ERROR_REASON_PROXY_AUTH_CANCELLED: |
+ case ERROR_REASON_PROXY_AUTH_CANCELLED: |
return kErrorReasonProxyAuthCancelled; |
- case ErrorScreenActor::ERROR_REASON_PROXY_AUTH_SUPPLIED: |
+ case ERROR_REASON_PROXY_AUTH_SUPPLIED: |
return kErrorReasonProxyAuthSupplied; |
- case ErrorScreenActor::ERROR_REASON_PROXY_CONNECTION_FAILED: |
+ case ERROR_REASON_PROXY_CONNECTION_FAILED: |
return kErrorReasonProxyConnectionFailed; |
- case ErrorScreenActor::ERROR_REASON_PROXY_CONFIG_CHANGED: |
+ case ERROR_REASON_PROXY_CONFIG_CHANGED: |
return kErrorReasonProxyConfigChanged; |
- case ErrorScreenActor::ERROR_REASON_LOADING_TIMEOUT: |
+ case ERROR_REASON_LOADING_TIMEOUT: |
return kErrorReasonLoadingTimeout; |
- case ErrorScreenActor::ERROR_REASON_PORTAL_DETECTED: |
+ case ERROR_REASON_PORTAL_DETECTED: |
return kErrorReasonPortalDetected; |
- case ErrorScreenActor::ERROR_REASON_NETWORK_STATE_CHANGED: |
+ case ERROR_REASON_NETWORK_STATE_CHANGED: |
return kErrorReasonNetworkStateChanged; |
- case ErrorScreenActor::ERROR_REASON_UPDATE: |
+ case ERROR_REASON_UPDATE: |
return kErrorReasonUpdate; |
- case ErrorScreenActor::ERROR_REASON_FRAME_ERROR: |
+ case ERROR_REASON_FRAME_ERROR: |
return kErrorReasonFrameError; |
default: |
NOTREACHED(); |
- return NULL; |
+ return nullptr; |
} |
} |