ash: Move "WiFi is turned on." buble to the notification center.

ash/system/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/system/network/tray_network.h"
 
 #include "ash/shelf/wm_shelf_util.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon.h"
 #include "ash/system/network/network_icon_animation.h"
 #include "ash/system/network/network_icon_animation_observer.h"
 #include "ash/system/network/network_state_list_detailed_view.h"
 #include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_utils.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/message_center/message_center.h"
+#include "ui/message_center/notification.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;
+using message_center::Notification;
 
 namespace ash {
 namespace tray {
 
 namespace {
 
+constexpr char kWifiToggleNotificationId[] = "wifi-toggle";
+
 // Returns the connected, non-virtual (aka VPN), network.
 const NetworkState* GetConnectedNetwork() {
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   return handler->ConnectedNetworkByType(NetworkTypePattern::NonVirtual());
 }
 
+std::unique_ptr<Notification> CreateNotification() {
+  bool wifi_enabled =
+      NetworkHandler::Get()->network_state_handler()->IsTechnologyEnabled(
+          NetworkTypePattern::WiFi());
+  const int string_id = wifi_enabled
+                            ? IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED
+                            : IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED;
+  std::unique_ptr<Notification> notification(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, kWifiToggleNotificationId,
+      base::string16(), l10n_util::GetStringUTF16(string_id),
+      gfx::Image(network_icon::GetBasicImageForWiFiNetwork(wifi_enabled)),
+      base::string16() /* display_source */, GURL(),
+      message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
+                                 system_notifier::kNotifierWifiToggle),
+      message_center::RichNotificationData(), nullptr));
+  return notification;
+}
+
 }  // namespace
 
 class NetworkTrayView : public TrayItemView,
                         public network_icon::AnimationObserver {
  public:
   explicit NetworkTrayView(TrayNetwork* network_tray)
       : TrayItemView(network_tray) {
     CreateImageView();
     UpdateNetworkStateHandlerIcon();
   }
@@ skipping 103 matching lines @@
     style->set_color_style(GetConnectedNetwork() != nullptr
                                ? TrayPopupItemStyle::ColorStyle::ACTIVE
                                : TrayPopupItemStyle::ColorStyle::INACTIVE);
     return style;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkDefaultView);
 };
 
-class NetworkWifiDetailedView : public NetworkDetailedView {

[tdanderson, 2017/04/18 23:33:32]

From what I can tell, once this CL lands you should be able to remove the
NetworkDetailedView interface and make NetworkStateListDetailedView directly
inherit from TrayDetailsView. If possible, could you do that in a follow-on CL
(or at the very least please file a bug and add a TODO to track that work and cc
me)?

[tetsui2, 2017/04/20 01:54:54]

Sure, I would do the follow-on CL then.

[tdanderson, 2017/04/21 15:25:01]

Thanks!

- public:
-  explicit NetworkWifiDetailedView(SystemTrayItem* owner)
-      : NetworkDetailedView(owner) {}
-
-  ~NetworkWifiDetailedView() override {}
-
-  // NetworkDetailedView:
-  void Init() override {
-    constexpr int kVerticalPadding = 10;
-    auto* box_layout = new views::BoxLayout(
-        views::BoxLayout::kHorizontal, kTrayPopupPaddingHorizontal,
-        kVerticalPadding, kTrayPopupPaddingBetweenItems);
-    SetLayoutManager(box_layout);
-
-    image_view_ = new views::ImageView;
-    AddChildView(image_view_);
-
-    label_view_ = new views::Label();
-    label_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    AddChildView(label_view_);
-    box_layout->SetFlexForView(label_view_, 1);
-
-    Update();
-  }
-
-  NetworkDetailedView::DetailedViewType GetViewType() const override {
-    return NetworkDetailedView::WIFI_VIEW;
-  }
-
-  void Update() override {
-    bool wifi_enabled =
-        NetworkHandler::Get()->network_state_handler()->IsTechnologyEnabled(
-            NetworkTypePattern::WiFi());
-    image_view_->SetImage(
-        network_icon::GetBasicImageForWiFiNetwork(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(l10n_util::GetStringUTF16(string_id));
-  }
-
- private:
-  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),
-      detailed_(NULL),
-      request_wifi_view_(false) {
+    : SystemTrayItem(system_tray, UMA_NETWORK), tray_(NULL), default_(NULL) {
   network_state_observer_.reset(new TrayNetworkStateObserver(this));
   SystemTrayNotifier* notifier = Shell::Get()->system_tray_notifier();
   notifier->AddNetworkObserver(this);
   notifier->AddNetworkPortalDetectorObserver(this);
 }
 
 TrayNetwork::~TrayNetwork() {
   SystemTrayNotifier* notifier = Shell::Get()->system_tray_notifier();
   notifier->RemoveNetworkObserver(this);
   notifier->RemoveNetworkPortalDetectorObserver(this);
@@ skipping 10 matching lines @@
 views::View* TrayNetwork::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == NULL);
   if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
   CHECK(tray_ != NULL);
   default_ = new tray::NetworkDefaultView(this);
   default_->SetEnabled(status != LoginStatus::LOCKED);
   return default_;
 }
 
-views::View* TrayNetwork::CreateDetailedView(LoginStatus status) {
-  CHECK(detailed_ == NULL);
-  ShellPort::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(

[tdanderson, 2017/04/18 23:33:32]

I don't think you want to kill off CreateDetailedView() entirely. If
|request_wifi_view_| is false then we still want to instantiate
NetworkStateListDetailedView as the detailed view type, which represents the
list of available networks. If you build and test this CL on device, try opening
the system menu and clicking on the network row; you should see a list of
available WiFi networks, but with this CL I think you will see nothing. Please
let me know if I am mistaken.

[tetsui2, 2017/04/20 01:54:55]

Done.

-        this, tray::NetworkStateListDetailedView::LIST_TYPE_NETWORK, status);
-  }
-  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;
-    ShowDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
-  }
+  message_center::MessageCenter* message_center =
+      message_center::MessageCenter::Get();
+  if (message_center->FindVisibleNotificationById(
+          tray::kWifiToggleNotificationId))
+    message_center->RemoveNotification(tray::kWifiToggleNotificationId, false);
+  message_center->AddNotification(tray::CreateNotification());
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   bool enabled = handler->IsTechnologyEnabled(NetworkTypePattern::WiFi());
   ShellPort::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