Add IPv6 Address to status tray

ash/system/chromeos/network/network_state_list_detailed_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 626 matching lines @@
 }
 
 void NetworkStateListDetailedView::OnInfoBubbleDestroyed() {
   info_bubble_ = nullptr;
 }
 
 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(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
   container->SetBorder(views::Border::CreateEmptyBorder(0, 5, 0, 5));
 
   std::string ethernet_address, wifi_address, vpn_address;
   if (list_type_ != LIST_TYPE_VPN) {
     ethernet_address = handler->FormattedHardwareAddressForType(
         NetworkTypePattern::Ethernet());
     wifi_address =
         handler->FormattedHardwareAddressForType(NetworkTypePattern::WiFi());
   } else {
     vpn_address =
         handler->FormattedHardwareAddressForType(NetworkTypePattern::VPN());
   }
 
   if (!ip_address.empty()) {
     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),
         ethernet_address));
   }
   if (!wifi_address.empty()) {
     container->AddChildView(CreateInfoBubbleLine(
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_WIFI), wifi_address));
   }
   if (!vpn_address.empty()) {
@@ skipping 107 matching lines @@
   label->SetEnabledColor(SkColorSetARGB(192, 0, 0, 0));
   return label;
 }
 
 void NetworkStateListDetailedView::RelayoutScrollList() {
   scroller()->Layout();
 }
 
 }  // namespace tray
 }  // namespace ash