diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 22:46:20 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 22:46:20 +0000 |
| commit | 7aef595332fb0070e8bbcd99ea5539ece1e20fc0 (patch) | |
| tree | 2c13bc407f29da9907a0fdb724ff01cb94dc24c6 /chrome/browser/chromeos/cros/network_constants.h | |
| parent | d44c8884770a03e81726ab774ecd4a501c2c2a69 (diff) | |
| download | chromium_src-7aef595332fb0070e8bbcd99ea5539ece1e20fc0.zip chromium_src-7aef595332fb0070e8bbcd99ea5539ece1e20fc0.tar.gz chromium_src-7aef595332fb0070e8bbcd99ea5539ece1e20fc0.tar.bz2 | |
Add a CONNECT_REQUESTED state to Network ConnectionState.
When a connection request is made, Chrome now sets the state to CONNECT_REQUESTED and ignores "Idle" state updates while in that state.
This informs the UI to show "connecting" icons / text until the connection attempt succeeds or fails.
Also: Don't update the network icon while scanning.
Also: includes a bunch of logging changes for improved debugging.
This alos fixes the mock expectations so that browser_tests should pass.
Original CL: https://chromiumcodereview.appspot.com/10554013
BUG=125121
TEST=See issue, test connecting between networks, UI should behave correctly.
For chrome/browser/chromeos/gdata:
TBR=gspencer@chromium.org, tbarzic@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10579022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/network_constants.h')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_constants.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros/network_constants.h b/chrome/browser/chromeos/cros/network_constants.h index 5fb7e77..332d8c4 100644 --- a/chrome/browser/chromeos/cros/network_constants.h +++ b/chrome/browser/chromeos/cros/network_constants.h @@ -226,7 +226,8 @@ enum ConnectionState { STATE_FAILURE = 7, STATE_ACTIVATION_FAILURE = 8, STATE_PORTAL = 9, - STATE_ONLINE = 10 + STATE_ONLINE = 10, + STATE_CONNECT_REQUESTED = 11, // Chrome only state }; // Network enums (see flimflam/include/network.h) |