mash: Convert system tray network item to wm common types

ash/system/chromeos/network/tray_vpn.cc

Index: ash/system/chromeos/network/tray_vpn.cc
diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc
deleted file mode 100644
index 10a75e06e2a7a5d2454d1e9c9471b8a0addd7501..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/network/tray_vpn.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-// 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/tray_vpn.h"
-
-#include "ash/common/session/session_state_delegate.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/system/tray/tray_item_more.h"
-#include "ash/common/system/tray/tray_popup_label_button.h"
-#include "ash/common/wm_shell.h"
-#include "ash/system/chromeos/network/network_state_list_detailed_view.h"
-#include "ash/system/chromeos/network/vpn_delegate.h"
-#include "ash/system/tray/system_tray.h"
-#include "chromeos/network/network_state.h"
-#include "chromeos/network/network_state_handler.h"
-#include "grit/ash_strings.h"
-#include "grit/ui_chromeos_strings.h"
-#include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/chromeos/network/network_icon.h"
-#include "ui/chromeos/network/network_icon_animation.h"
-#include "ui/chromeos/network/network_icon_animation_observer.h"
-
-using chromeos::NetworkHandler;
-using chromeos::NetworkState;
-using chromeos::NetworkStateHandler;
-using chromeos::NetworkTypePattern;
-
-namespace ash {
-namespace tray {
-
-class VpnDefaultView : public TrayItemMore,
-                       public ui::network_icon::AnimationObserver {
- public:
-  VpnDefaultView(SystemTrayItem* owner, bool show_more)
-      : TrayItemMore(owner, show_more) {
-    Update();
-  }
-
-  ~VpnDefaultView() override {
-    ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
-  }
-
-  static bool ShouldShow() {
-    // Show the VPN entry in the ash tray bubble if at least one third-party VPN
-    // provider is installed.
-    if (WmShell::Get()
-            ->system_tray_delegate()
-            ->GetVPNDelegate()
-            ->HaveThirdPartyVPNProviders()) {
-      return true;
-    }
-
-    // Also show the VPN entry if at least one VPN network is configured.
-    NetworkStateHandler* const handler =
-        NetworkHandler::Get()->network_state_handler();
-    if (handler->FirstNetworkByType(NetworkTypePattern::VPN()))
-      return true;
-    return false;
-  }
-
-  void Update() {
-    gfx::ImageSkia image;
-    base::string16 label;
-    bool animating = false;
-    GetNetworkStateHandlerImageAndLabel(&image, &label, &animating);
-    if (animating)
-      ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
-    else
-      ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(
-          this);
-    SetImage(&image);
-    SetLabel(label);
-    SetAccessibleName(label);
-  }
-
-  // ui::network_icon::AnimationObserver
-  void NetworkIconChanged() override { Update(); }
-
- private:
-  void GetNetworkStateHandlerImageAndLabel(gfx::ImageSkia* image,
-                                           base::string16* label,
-                                           bool* animating) {
-    NetworkStateHandler* handler =
-        NetworkHandler::Get()->network_state_handler();
-    const NetworkState* vpn =
-        handler->FirstNetworkByType(NetworkTypePattern::VPN());
-    if (!vpn || (!vpn->IsConnectedState() && !vpn->IsConnectingState())) {
-      *image = ui::network_icon::GetImageForDisconnectedNetwork(
-          ui::network_icon::ICON_TYPE_DEFAULT_VIEW, shill::kTypeVPN);
-      if (label) {
-        *label =
-            l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED);
-      }
-      *animating = false;
-      return;
-    }
-    *animating = vpn->IsConnectingState();
-    *image = ui::network_icon::GetImageForNetwork(
-        vpn, ui::network_icon::ICON_TYPE_DEFAULT_VIEW);
-    if (label) {
-      *label = ui::network_icon::GetLabelForNetwork(
-          vpn, ui::network_icon::ICON_TYPE_DEFAULT_VIEW);
-    }
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(VpnDefaultView);
-};
-
-}  // namespace tray
-
-TrayVPN::TrayVPN(SystemTray* system_tray)
-    : SystemTrayItem(system_tray), default_(NULL), detailed_(NULL) {
-  network_state_observer_.reset(new TrayNetworkStateObserver(this));
-}
-
-TrayVPN::~TrayVPN() {}
-
-views::View* TrayVPN::CreateTrayView(LoginStatus status) {
-  return NULL;
-}
-
-views::View* TrayVPN::CreateDefaultView(LoginStatus status) {
-  CHECK(default_ == NULL);
-  if (!chromeos::NetworkHandler::IsInitialized())
-    return NULL;
-  if (status == LoginStatus::NOT_LOGGED_IN)
-    return NULL;
-  if (!tray::VpnDefaultView::ShouldShow())
-    return NULL;
-
-  const bool is_in_secondary_login_screen =
-      WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
-
-  default_ = new tray::VpnDefaultView(
-      this, status != LoginStatus::LOCKED && !is_in_secondary_login_screen);
-
-  return default_;
-}
-
-views::View* TrayVPN::CreateDetailedView(LoginStatus status) {
-  CHECK(detailed_ == NULL);
-  if (!chromeos::NetworkHandler::IsInitialized())
-    return NULL;
-
-  WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_DETAILED_VPN_VIEW);
-  detailed_ = new tray::NetworkStateListDetailedView(
-      this, tray::NetworkStateListDetailedView::LIST_TYPE_VPN, status);
-  detailed_->Init();
-  return detailed_;
-}
-
-void TrayVPN::DestroyTrayView() {}
-
-void TrayVPN::DestroyDefaultView() {
-  default_ = NULL;
-}
-
-void TrayVPN::DestroyDetailedView() {
-  detailed_ = NULL;
-}
-
-void TrayVPN::UpdateAfterLoginStatusChange(LoginStatus status) {}
-
-void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
-
-void TrayVPN::NetworkStateChanged() {
-  if (default_)
-    default_->Update();
-  if (detailed_)
-    detailed_->Update();
-}
-
-}  // namespace ash