Update system tray if vpn networks appear

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/shell.h"
 #include "ash/system/chromeos/network/network_list_detailed_view_base.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 "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 class VpnDefaultView : public TrayItemMore {
  public:
   VpnDefaultView(SystemTrayItem* owner, bool show_more)
       : TrayItemMore(owner, show_more) {
     Update();
   }
 
   virtual ~VpnDefaultView() {}
 
+  static bool ShouldShow() {
+    // Do not show VPN line in uber tray bubble if VPN is not configured.
+    std::vector<NetworkIconInfo> list;
+    Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(&list);
+    return list.size() != 0;
+  }
+
   void Update() {
     NetworkIconInfo info;
     Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworkIcon(&info);
     SetImage(&info.image);
     SetLabel(info.description);
     SetAccessibleName(info.description);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VpnDefaultView);
@@ skipping 106 matching lines @@
 
 views::View* TrayVPN::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
 views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
   if (status == user::LOGGED_IN_NONE)
     return NULL;
 
-  // Do not show VPN line in uber tray bubble if VPN is not configured.
-  std::vector<NetworkIconInfo> list;
-  Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(&list);
-  if (list.size() == 0)
+  if (!tray::VpnDefaultView::ShouldShow())
     return NULL;
 
   default_ = new tray::VpnDefaultView(this, status != user::LOGGED_IN_LOCKED);
   return default_;
 }
 
 views::View* TrayVPN::CreateDetailedView(user::LoginStatus status) {
   CHECK(detailed_ == NULL);
   detailed_ = new tray::VpnListDetailedView(
       this, status, IDS_ASH_STATUS_TRAY_VPN);
@@ skipping 19 matching lines @@
 void TrayVPN::DestroyNotificationView() {
 }
 
 void TrayVPN::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
 }
 
 void TrayVPN::OnNetworkRefresh(const NetworkIconInfo& info) {
-  if (default_)
+  if (default_) {
     default_->Update();
+  } else if (tray::VpnDefaultView::ShouldShow()) {
+    if (system_tray()->HasSystemBubbleType(
+            SystemTrayBubble::BUBBLE_TYPE_DEFAULT)) {
+      // We created the default view without a VPN view, so rebuild it.
+      system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
+    }
+  }
+
   if (detailed_)
     detailed_->ManagerChanged();
 }
 
 void TrayVPN::SetNetworkMessage(NetworkTrayDelegate* delegate,
                                    MessageType message_type,
                                    NetworkType network_type,
                                    const string16& title,
                                    const string16& message,
                                    const std::vector<string16>& links) {
 }
 
 void TrayVPN::ClearNetworkMessage(MessageType message_type) {
 }
 
 void TrayVPN::OnWillToggleWifi() {
 }
 
 }  // namespace internal
 }  // namespace ash