CrOS: Right align captive portal/"controlled by extension" network icon

ash/system/network/network_list.cc

 // Copyright 2016 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/network/network_list.h"
 
 #include <memory>
 
 #include "ash/shell.h"
 #include "ash/shell_port.h"
@@ skipping 612 matching lines @@
   HoverHighlightView* container = new HoverHighlightView(detailed_view());
   if (info.connected)
     SetupConnectedItem(container, info.label, info.image);
   else if (info.connecting)
     SetupConnectingItem(container, info.label, info.image);
   else
     container->AddIconAndLabel(info.image, info.label);
   container->SetTooltipText(info.tooltip);
   views::View* controlled_icon = CreateControlledByExtensionView(info);
   if (controlled_icon)
-    container->AddChildView(controlled_icon);
+    container->AddRightView(controlled_icon);
   return container;
 }
 
 void NetworkListView::UpdateViewForNetwork(HoverHighlightView* view,
                                            const NetworkInfo& info) {
   DCHECK(!view->has_children());
   if (info.connected)
     SetupConnectedItem(view, info.label, info.image);
   else if (info.connecting)
     SetupConnectingItem(view, info.label, info.image);
@@ skipping 10 matching lines @@
   NetworkingConfigDelegate* networking_config_delegate =
       Shell::Get()->system_tray_delegate()->GetNetworkingConfigDelegate();
   if (!networking_config_delegate)
     return nullptr;
   std::unique_ptr<const NetworkingConfigDelegate::ExtensionInfo>
       extension_info =
           networking_config_delegate->LookUpExtensionForNetwork(info.guid);
   if (!extension_info)
     return nullptr;
 
-  // Get the tooltip text.
-  base::string16 tooltip_text = l10n_util::GetStringFUTF16(
-      IDS_ASH_STATUS_TRAY_EXTENSION_CONTROLLED_WIFI,
-      base::UTF8ToUTF16(extension_info->extension_name));
-
-  views::ImageView* controlled_icon =
-      new FixedSizedImageView(kTrayPopupDetailsIconWidth, 0);
-
+  views::ImageView* controlled_icon = TrayPopupUtils::CreateMainImageView();
   controlled_icon->SetImage(
       gfx::CreateVectorIcon(kCaptivePortalIcon, kMenuIconColor));
-  controlled_icon->SetTooltipText(tooltip_text);
+  controlled_icon->SetTooltipText(l10n_util::GetStringFUTF16(
+      IDS_ASH_STATUS_TRAY_EXTENSION_CONTROLLED_WIFI,
+      base::UTF8ToUTF16(extension_info->extension_name)));
   return controlled_icon;
 }
 
 std::unique_ptr<std::set<std::string>> NetworkListView::UpdateNetworkChildren(
     NetworkInfo::Type type,
     int index) {
   std::unique_ptr<std::set<std::string>> new_guids(new std::set<std::string>);
   for (const auto& info : network_list_) {
     if (info->type != type)
       continue;
@@ skipping 136 matching lines @@
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
   style.SetupLabel(label);
   connection_warning->AddView(TriView::Container::CENTER, label);
 
   // Nothing to the right of the text.
   connection_warning->SetContainerVisible(TriView::Container::END, false);
   return connection_warning;
 }
 
 }  // namespace ash