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

ash/system/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/network/network_state_list_detailed_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 15 matching lines @@
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/throbber_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_popup_header_button.h"
+#include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/device_state.h"
@@ skipping 404 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);

[tdanderson, 2017/05/01 15:31:16]

Can you please rebase and then re-ping? It looks like the code you're modifying
currently lives in network_list.cc and not network_state_list_detailed_view.cc

-
+  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;
 }
 
 void NetworkStateListDetailedView::CallRequestScan() {
   VLOG(1) << "Requesting Network Scan.";
   NetworkHandler::Get()->network_state_handler()->RequestScan();
   // Periodically request a scan while this UI is open.
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&NetworkStateListDetailedView::CallRequestScan, AsWeakPtr()),
       base::TimeDelta::FromSeconds(kRequestScanDelaySeconds));
 }
 
 views::View* NetworkStateListDetailedView::CreateViewForNetwork(
     const NetworkInfo& info) {
   HoverHighlightView* container = new HoverHighlightView(this);
-  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);
+  UpdateViewForNetwork(container, info);
   return container;
 }
 
 NetworkTypePattern NetworkStateListDetailedView::GetNetworkTypePattern() const {
   return list_type_ == LIST_TYPE_VPN ? NetworkTypePattern::VPN()
                                      : NetworkTypePattern::NonVirtual();
 }
 
 void NetworkStateListDetailedView::UpdateViewForNetwork(
     views::View* view,
     const NetworkInfo& info) {
   HoverHighlightView* container = static_cast<HoverHighlightView*>(view);
   DCHECK(!container->has_children());
   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);
   views::View* controlled_icon = CreateControlledByExtensionView(info);
   container->SetTooltipText(info.tooltip);
   if (controlled_icon)
-    view->AddChildView(controlled_icon);
+    container->AddRightView(controlled_icon);
 }
 
 views::Label* NetworkStateListDetailedView::CreateInfoLabel() {
   views::Label* label = new views::Label();
   label->SetBorder(views::CreateEmptyBorder(kTrayPopupPaddingBetweenItems,
                                             kTrayPopupPaddingHorizontal,
                                             kTrayPopupPaddingBetweenItems, 0));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SetEnabledColor(SkColorSetARGB(192, 0, 0, 0));
   return label;
 }
 
 void NetworkStateListDetailedView::OnNetworkEntryClicked(views::View* sender) {
   HandleViewClicked(sender);
 }
 
 void NetworkStateListDetailedView::OnOtherWifiClicked() {
   ShellPort::Get()->RecordUserMetricsAction(
       UMA_STATUS_AREA_NETWORK_JOIN_OTHER_CLICKED);
   Shell::Get()->system_tray_controller()->ShowNetworkCreate(shill::kTypeWifi);
 }
 
 void NetworkStateListDetailedView::RelayoutScrollList() {
   scroller()->Layout();
 }
 
 }  // namespace tray
 }  // namespace ash