diff options
| author | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 01:51:55 +0000 |
|---|---|---|
| committer | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 01:51:55 +0000 |
| commit | 651ee82b0323b84268e14a03df5000b10bf19370 (patch) | |
| tree | a8b27c5c3d73032a6ceb0c152bf158835b0ee3d5 /chrome/browser/chromeos/cros | |
| parent | 124e90f4e904b071d6807d970d37c8ab9893b891 (diff) | |
| download | chromium_src-651ee82b0323b84268e14a03df5000b10bf19370.zip chromium_src-651ee82b0323b84268e14a03df5000b10bf19370.tar.gz chromium_src-651ee82b0323b84268e14a03df5000b10bf19370.tar.bz2 | |
Land for jackc:
Fix for ethernet not getting detected in login screen
Old version would always chose the last available
ethernet service in the list. This change makes it
so it chooses a connected service over a unconnected
service.
BUG=None
TEST=Ran browser with this change
Review URL: http://codereview.chromium.org/3027015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 105442d..6e13d62 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -602,7 +602,9 @@ void NetworkLibraryImpl::ParseSystem(SystemInfo* system, " fav=" << service.favorite << " auto=" << service.auto_connect << " error=" << service.error; - if (service.type == TYPE_ETHERNET) + // Once a connected ethernet service is found, disregard other ethernet + // services that are also found + if (service.type == TYPE_ETHERNET && !(ethernet->connected())) ethernet->ConfigureFromService(service); else if (service.type == TYPE_WIFI) wifi_networks->push_back(WifiNetwork(service)); |