diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-01 18:02:15 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-01 18:02:15 +0000 |
| commit | 7476dcc28a981cc5889d5c2ccc64df333a76b9de (patch) | |
| tree | b36d34a7b93c3de278736de16ec35edd202990b5 | |
| parent | 351b41f5189ee95e3e6d414cce81e7cc1cf05758 (diff) | |
| download | chromium_src-7476dcc28a981cc5889d5c2ccc64df333a76b9de.zip chromium_src-7476dcc28a981cc5889d5c2ccc64df333a76b9de.tar.gz chromium_src-7476dcc28a981cc5889d5c2ccc64df333a76b9de.tar.bz2 | |
athena: Show a connected network in the debug status-window.
BUG=399257
R=oshima@chromium.org
Review URL: https://codereview.chromium.org/428263005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287046 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | athena/main/debug/debug_window.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/athena/main/debug/debug_window.cc b/athena/main/debug/debug_window.cc index bc0abcf..e53740a 100644 --- a/athena/main/debug/debug_window.cc +++ b/athena/main/debug/debug_window.cc @@ -18,6 +18,7 @@ #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/network/network_state_handler_observer.h" +#include "chromeos/network/network_type_pattern.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" @@ -125,6 +126,10 @@ class NetworkStatus : public chromeos::NetworkStateHandlerObserver { chromeos::NetworkStateHandler* handler = chromeos::NetworkHandler::Get()->network_state_handler(); const chromeos::NetworkState* network = handler->DefaultNetwork(); + if (!network) { + network = handler->ConnectedNetworkByType( + chromeos::NetworkTypePattern::NonVirtual()); + } if (network) { status = base::StringPrintf( "%s (%s)", network->ip_address().c_str(), network->name().c_str()); |