diff options
| author | stevenjb <stevenjb@chromium.org> | 2015-10-26 11:47:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-26 18:49:07 +0000 |
| commit | 02bc9e0cd866938b72f24ea95d9a6414bc973232 (patch) | |
| tree | c1e889bb11ae179e778771dc7772338a4998d4df /ash | |
| parent | e9b0b79b5b64ecd6df10152479c7266f24418d82 (diff) | |
| download | chromium_src-02bc9e0cd866938b72f24ea95d9a6414bc973232.zip chromium_src-02bc9e0cd866938b72f24ea95d9a6414bc973232.tar.gz chromium_src-02bc9e0cd866938b72f24ea95d9a6414bc973232.tar.bz2 | |
Add IPv6 Address to status tray
BUG=526975
Review URL: https://codereview.chromium.org/1417853002
Cr-Commit-Position: refs/heads/master@{#356084}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash_chromeos_strings.grdp | 3 | ||||
| -rw-r--r-- | ash/system/chromeos/network/network_state_list_detailed_view.cc | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/ash/ash_chromeos_strings.grdp b/ash/ash_chromeos_strings.grdp index a928ab9..3adf983 100644 --- a/ash/ash_chromeos_strings.grdp +++ b/ash/ash_chromeos_strings.grdp @@ -54,6 +54,9 @@ <message name="IDS_ASH_STATUS_TRAY_IP" desc="The label for the IP address of the network:"> IP Address </message> + <message name="IDS_ASH_STATUS_TRAY_IPV6" desc="The label for the IP address of the network:"> + IPv6 Address + </message> <message name="IDS_ASH_STATUS_TRAY_NETWORK_SETTINGS" desc="The label used in the settings entry in the network dialog."> Settings... </message> diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc index d6a11df..858690d 100644 --- a/ash/system/chromeos/network/network_state_list_detailed_view.cc +++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc @@ -644,10 +644,15 @@ views::View* NetworkStateListDetailedView::CreateNetworkInfoView() { ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler(); - std::string ip_address("0.0.0.0"); + std::string ip_address, ipv6_address; const NetworkState* network = handler->DefaultNetwork(); - if (network) - ip_address = network->ip_address(); + if (network) { + const DeviceState* device = handler->GetDeviceState(network->device_path()); + if (device) { + ip_address = device->GetIpAddressByType(shill::kTypeIPv4); + ipv6_address = device->GetIpAddressByType(shill::kTypeIPv6); + } + } views::View* container = new views::View; container->SetLayoutManager( @@ -669,6 +674,10 @@ views::View* NetworkStateListDetailedView::CreateNetworkInfoView() { container->AddChildView(CreateInfoBubbleLine( bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_IP), ip_address)); } + if (!ipv6_address.empty()) { + container->AddChildView(CreateInfoBubbleLine( + bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_IPV6), ipv6_address)); + } if (!ethernet_address.empty()) { container->AddChildView(CreateInfoBubbleLine( bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_ETHERNET), |