diff options
author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 20:54:26 +0000 |
---|---|---|
committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 20:54:26 +0000 |
commit | e349d88f107d2e1beab0c3cbc43614580a2363bf (patch) | |
tree | b95937ec9db0dd96bf6bfb47641e54dafc84e0cc /dbus | |
parent | 5c80e2b837470d4d02692aceb604ba6909e074d5 (diff) | |
download | chromium_src-e349d88f107d2e1beab0c3cbc43614580a2363bf.zip chromium_src-e349d88f107d2e1beab0c3cbc43614580a2363bf.tar.gz chromium_src-e349d88f107d2e1beab0c3cbc43614580a2363bf.tar.bz2 |
Merge 143072 - 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
TBR=stevenjb@google.com
Review URL: https://chromiumcodereview.appspot.com/10661031
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@144543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/object_proxy.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc index 62c0eb8..ba51efa 100644 --- a/dbus/object_proxy.cc +++ b/dbus/object_proxy.cc @@ -494,6 +494,7 @@ void ObjectProxy::LogMethodCallFailure( return; LOG(ERROR) << "Failed to call method: " << interface_name << "." << method_name + << ": object_path= " << object_path_.value() << ": " << error_name << ": " << error_message; } |