Add ash UI for third-party VPNs

ash/system/chromeos/network/tray_vpn.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/chromeos/network/tray_vpn.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/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 "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_popup_label_button.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() {
-    // Do not show VPN line in uber tray bubble if VPN is not configured.
-    NetworkStateHandler* handler =
+    // Show the VPN entry in the ash tray bubble if at least one third-party VPN
+    // provider is installed.
+    if (Shell::GetInstance()
+            ->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();
-    const NetworkState* vpn =
-        handler->FirstNetworkByType(NetworkTypePattern::VPN());
-    return vpn != NULL;
+    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
@@ skipping 101 matching lines @@
 }
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash