diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 23:46:11 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 23:46:11 +0000 |
| commit | e9c3367a46b50d045fdaaa53cf00e1502bd7a1b8 (patch) | |
| tree | e3ea49811b0d70b5553dfb9324b485e4bf1bea98 | |
| parent | a69e81f76395fb810ff416332c1a06e59ed4d5cb (diff) | |
| download | chromium_src-e9c3367a46b50d045fdaaa53cf00e1502bd7a1b8.zip chromium_src-e9c3367a46b50d045fdaaa53cf00e1502bd7a1b8.tar.gz chromium_src-e9c3367a46b50d045fdaaa53cf00e1502bd7a1b8.tar.bz2 | |
Fix FirstNetworkByType, and some minor debugging
The change to combine NetworkState and FavoriteState broke
FirstNetworkByType for VPN since it doesn't appear with the "visible"
networks. We don't use that method a lot, so the easy fix is to remove
the early exit and continue instead of break.
BUG=375955
TBR=pneubeck@chromium.org
Review URL: https://codereview.chromium.org/332713003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276851 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/resources/chromeos/network_ui/network_ui.html b/chrome/browser/resources/chromeos/network_ui/network_ui.html index ffb87e07..2f7f356 100644 --- a/chrome/browser/resources/chromeos/network_ui/network_ui.html +++ b/chrome/browser/resources/chromeos/network_ui/network_ui.html @@ -39,6 +39,7 @@ <td>Name</td> <td>Type</td> <td>State</td> + <td>Connect?</td> <td>Error</td> <td>Security</td> <td>Technology</td> diff --git a/chrome/browser/resources/chromeos/network_ui/network_ui.js b/chrome/browser/resources/chromeos/network_ui/network_ui.js index 844d47a..7a6dd59 100644 --- a/chrome/browser/resources/chromeos/network_ui/network_ui.js +++ b/chrome/browser/resources/chromeos/network_ui/network_ui.js @@ -13,6 +13,7 @@ var NetworkUI = (function() { 'Name', 'Type', 'ConnectionState', + 'connectable', 'ErrorState', 'WiFi.Security', ['Cellular.NetworkTechnology', diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc index 179df28..aa91883 100644 --- a/chromeos/network/network_state_handler.cc +++ b/chromeos/network/network_state_handler.cc @@ -222,7 +222,7 @@ const NetworkState* NetworkStateHandler::FirstNetworkByType( if (!network->update_received()) continue; if (!network->visible()) - break; + continue; if (network->Matches(type)) return network; } diff --git a/chromeos/network/network_util.cc b/chromeos/network/network_util.cc index 377167f..9c20670 100644 --- a/chromeos/network/network_util.cc +++ b/chromeos/network/network_util.cc @@ -170,6 +170,7 @@ scoped_ptr<base::ListValue> TranslateNetworkListToONC( TranslateNetworkStateToONC(*it); if (debugging_properties) { + onc_dictionary->SetBoolean("connectable", (*it)->connectable()); onc_dictionary->SetBoolean("visible", (*it)->visible()); onc_dictionary->SetString("profile_path", (*it)->profile_path()); std::string onc_source = (*it)->ui_data().GetONCSourceAsString(); |