Update appearance of Wi-Fi toggle notification.

ash/common/system/chromeos/network/tray_network.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/common/system/chromeos/network/tray_network.h"
 
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/network/network_icon.h"
 #include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/common/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_shell.h"
-#include "ash/resources/grit/ash_resources.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 using chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 using chromeos::NetworkTypePattern;
@@ skipping 128 matching lines @@
     return style;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkDefaultView);
 };
 
 class NetworkWifiDetailedView : public NetworkDetailedView {
  public:
   explicit NetworkWifiDetailedView(SystemTrayItem* owner)
-      : NetworkDetailedView(owner) {
-    SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
-                                          kTrayPopupPaddingHorizontal, 10,
-                                          kTrayPopupPaddingBetweenItems));
+      : NetworkDetailedView(owner) {}
+
+  ~NetworkWifiDetailedView() override {}
+
+  // NetworkDetailedView:
+  void Init() override {
+    auto* box_layout = new views::BoxLayout(views::BoxLayout::kHorizontal,
+                                            kTrayPopupPaddingHorizontal, 10,

[James Cook, 2017/03/21 19:57:31]

nit: put the magic 10 in a named constant

[Evan Stade, 2017/03/22 20:33:54]

Done.

+                                            kTrayPopupPaddingBetweenItems);
+    SetLayoutManager(box_layout);
+
     image_view_ = new views::ImageView;
     AddChildView(image_view_);
 
     label_view_ = new views::Label();
-    label_view_->SetMultiLine(true);
     label_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(label_view_);
+    box_layout->SetFlexForView(label_view_, 1);
 
     Update();
   }
 
-  ~NetworkWifiDetailedView() override {}
-
-  // Overridden from NetworkDetailedView:
-
-  void Init() override {}
-
   NetworkDetailedView::DetailedViewType GetViewType() const override {
     return NetworkDetailedView::WIFI_VIEW;
   }
 
-  void Layout() override {
-    // Center both views vertically.
-    views::View::Layout();
-    image_view_->SetY((height() - image_view_->GetPreferredSize().height()) /
-                      2);
-    label_view_->SetY((height() - label_view_->GetPreferredSize().height()) /
-                      2);
-  }
-
   void Update() override {
     bool wifi_enabled =
         NetworkHandler::Get()->network_state_handler()->IsTechnologyEnabled(
             NetworkTypePattern::WiFi());
-    const int image_id = wifi_enabled ? IDR_AURA_UBER_TRAY_WIFI_ENABLED
-                                      : IDR_AURA_UBER_TRAY_WIFI_DISABLED;
-    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-    image_view_->SetImage(bundle.GetImageNamed(image_id).ToImageSkia());
+    image_view_->SetImage(network_icon::GetImageForWifiChipState(wifi_enabled));
 
     const int string_id = wifi_enabled
                               ? IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED
                               : IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED;
-    label_view_->SetText(bundle.GetLocalizedString(string_id));
-    label_view_->SizeToFit(
-        kTrayPopupMinWidth - kTrayPopupPaddingHorizontal * 2 -
-        kTrayPopupPaddingBetweenItems - kTrayPopupDetailsIconWidth);
+    label_view_->SetText(l10n_util::GetStringUTF16(string_id));
   }
 
  private:
-  views::ImageView* image_view_;
-  views::Label* label_view_;
+  views::ImageView* image_view_ = nullptr;
+  views::Label* label_view_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkWifiDetailedView);
 };
 
 }  // namespace tray
 
 TrayNetwork::TrayNetwork(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_NETWORK),
       tray_(NULL),
       default_(NULL),
@@ skipping 34 matching lines @@
   WmShell::Get()->RecordUserMetricsAction(
       UMA_STATUS_AREA_DETAILED_NETWORK_VIEW);
   if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
   if (request_wifi_view_) {
     detailed_ = new tray::NetworkWifiDetailedView(this);
     request_wifi_view_ = false;
   } else {
     detailed_ = new tray::NetworkStateListDetailedView(
         this, tray::NetworkStateListDetailedView::LIST_TYPE_NETWORK, status);
-    detailed_->Init();
   }
+  detailed_->Init();
   return detailed_;
 }
 
 void TrayNetwork::DestroyTrayView() {
   tray_ = NULL;
 }
 
 void TrayNetwork::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayNetwork::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 void TrayNetwork::RequestToggleWifi() {
   // This will always be triggered by a user action (e.g. keyboard shortcut)
   if (!detailed_ ||
       detailed_->GetViewType() == tray::NetworkDetailedView::WIFI_VIEW) {
     request_wifi_view_ = true;
-    PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
+    PopUpDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
   }
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   bool enabled = handler->IsTechnologyEnabled(NetworkTypePattern::WiFi());
   WmShell::Get()->RecordUserMetricsAction(
       enabled ? UMA_STATUS_AREA_DISABLE_WIFI : UMA_STATUS_AREA_ENABLE_WIFI);
   handler->SetTechnologyEnabled(NetworkTypePattern::WiFi(), !enabled,
                                 chromeos::network_handler::ErrorCallback());
 }
 
 void TrayNetwork::OnCaptivePortalDetected(const std::string& /* guid */) {
   NetworkStateChanged();
 }
 
 void TrayNetwork::NetworkStateChanged() {
   if (tray_)
     tray_->UpdateNetworkStateHandlerIcon();
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash