Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Unified Diff: ash/common/system/chromeos/network/network_state_list_detailed_view.cc

Issue 2790463004: Ash Tray: Fix ip address to work for VPN (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
index 267b0f99444c6f328b4af73cdf96118b3b2b49eb..456755e2ccba1e541a928309704d7d1b8893150d 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
@@ -412,11 +412,10 @@ views::View* NetworkStateListDetailedView::CreateNetworkInfoView() {
std::string ip_address, ipv6_address;
const NetworkState* network = handler->DefaultNetwork();
if (network) {
+ ip_address = network->ip_address();
const DeviceState* device = handler->GetDeviceState(network->device_path());
- if (device) {
- ip_address = device->GetIpAddressByType(shill::kTypeIPv4);
+ if (device)
ipv6_address = device->GetIpAddressByType(shill::kTypeIPv6);
- }
}
std::string ethernet_address, wifi_address;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698