diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-18 01:31:36 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-18 01:31:36 +0000 |
| commit | 059234d4e9973dcbc01fa02344bd6145a6ca2603 (patch) | |
| tree | 95c8810425ffc310720f0a0d63038d7275d51a64 | |
| parent | fa105f0f62a1b391cda50746107b4dc446f40177 (diff) | |
| download | chromium_src-059234d4e9973dcbc01fa02344bd6145a6ca2603.zip chromium_src-059234d4e9973dcbc01fa02344bd6145a6ca2603.tar.gz chromium_src-059234d4e9973dcbc01fa02344bd6145a6ca2603.tar.bz2 | |
Merge 89164 - [cros] Match NetworkLibrary error value with flimflam: UNKNOWN > NO_ERROR.
BUG=chrome-os-partner:4058
TEST=Manual.
Review URL: http://codereview.chromium.org/7169007
TBR=davemoore@chromium.org
Review URL: http://codereview.chromium.org/7191011
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@89577 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.h | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 31ebe0e..85e0f94 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -679,7 +679,7 @@ static ConnectionError ParseError(const std::string& error) { { kErrorAaaFailed, ERROR_AAA_FAILED }, }; static StringToEnum<ConnectionError> parser( - table, arraysize(table), ERROR_UNKNOWN); + table, arraysize(table), ERROR_NO_ERROR); return parser.Get(error); } @@ -1201,8 +1201,9 @@ std::string Network::GetStateString() const { std::string Network::GetErrorString() const { switch (error_) { - case ERROR_UNKNOWN: - return l10n_util::GetStringUTF8(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); + case ERROR_NO_ERROR: + // TODO(nkostylev): Introduce new error message "None" instead. + return std::string(); case ERROR_OUT_OF_RANGE: return l10n_util::GetStringUTF8(IDS_CHROMEOS_NETWORK_ERROR_OUT_OF_RANGE); case ERROR_PIN_MISSING: diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h index 77d6c46..e485660 100644 --- a/chrome/browser/chromeos/cros/network_library.h +++ b/chrome/browser/chromeos/cros/network_library.h @@ -129,7 +129,7 @@ enum PinOperationError { // connection errors (see flimflam/include/service.h) enum ConnectionError { - ERROR_UNKNOWN = 0, + ERROR_NO_ERROR = 0, ERROR_OUT_OF_RANGE = 1, ERROR_PIN_MISSING = 2, ERROR_DHCP_FAILED = 3, @@ -329,7 +329,7 @@ class Network { protected: Network(const std::string& service_path, ConnectionType type) : state_(STATE_UNKNOWN), - error_(ERROR_UNKNOWN), + error_(ERROR_NO_ERROR), connectable_(true), is_active_(false), favorite_(false), diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 16da1e5..7be689a 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -939,7 +939,7 @@ void MobileSetupHandler::EvaluateCellularNetwork( if ((network->activation_state() == chromeos::ACTIVATION_STATE_PARTIALLY_ACTIVATED || network->activation_state() == chromeos::ACTIVATION_STATE_ACTIVATING) && - (network->error() == chromeos::ERROR_UNKNOWN || + (network->error() == chromeos::ERROR_NO_ERROR || network->error() == chromeos::ERROR_OTASP_FAILED) && network->state() == chromeos::STATE_ACTIVATION_FAILURE) { LOG(WARNING) << "Activation failure detected " |