diff options
| author | gauravsh@chromium.org <gauravsh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 00:18:40 +0000 |
|---|---|---|
| committer | gauravsh@chromium.org <gauravsh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 00:18:40 +0000 |
| commit | b93ea39a7c68d809112e8d168c8aa18517f21555 (patch) | |
| tree | 424d532742a213637025e007e2777edc1ff628ef /chromeos/dbus | |
| parent | f80aa37e487d5110edc097bfd0c33d4b17637eb2 (diff) | |
| download | chromium_src-b93ea39a7c68d809112e8d168c8aa18517f21555.zip chromium_src-b93ea39a7c68d809112e8d168c8aa18517f21555.tar.gz chromium_src-b93ea39a7c68d809112e8d168c8aa18517f21555.tar.bz2 | |
NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler
[reland of 200968 after nkostylev's fix to remove the NOTREACHED in
WebUIScreenLocker::IsSigninProgress crbug.com/241548]
This removes the direct network library dependency for NetworkPortalDetector,
NetworkStateInformer, and SigninScreenHandler. UpdateScreen and
LocallyManagedUserCreationHandler no longer depend on NetworkLibrary as well.
Also change active -> default network in these to be consistent with
terminology we use in NetworkStateHandler.
BUG=189093,189009
Review URL: https://chromiumcodereview.appspot.com/15359008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus')
| -rw-r--r-- | chromeos/dbus/shill_service_client_stub.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromeos/dbus/shill_service_client_stub.cc b/chromeos/dbus/shill_service_client_stub.cc index af4245c..d4e131d 100644 --- a/chromeos/dbus/shill_service_client_stub.cc +++ b/chromeos/dbus/shill_service_client_stub.cc @@ -106,10 +106,13 @@ void ShillServiceClientStub::SetProperty(const dbus::ObjectPath& service_path, return; } if (name == flimflam::kStateProperty) { - // If we connect to a service, then we move it to the top of the list in - // the manager client. + // If the service went into a connected state, then move it to the top of + // the list in the manager client. + // TODO(gauravsh): Generalize to sort services properly to allow for testing + // more complex scenarios. std::string state; - if (value.GetAsString(&state) && state == flimflam::kStateOnline) { + if (value.GetAsString(&state) && (state == flimflam::kStateOnline || + state == flimflam::kStatePortal)) { ShillManagerClient* manager_client = DBusThreadManager::Get()->GetShillManagerClient(); manager_client->GetTestInterface()->MoveServiceToIndex( |