tray_vpn.cc revision c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d
15821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)// Copyright (c) 2012 The Chromium Authors. All rights reserved. 25821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)// Use of this source code is governed by a BSD-style license that can be 35821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)// found in the LICENSE file. 45821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 55821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ash/system/chromeos/network/tray_vpn.h" 65821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 72a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "ash/ash_switches.h" 85821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ash/shell.h" 92a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "ash/system/chromeos/network/network_icon_animation.h" 105821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ash/system/chromeos/network/network_list_detailed_view_base.h" 112a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "ash/system/chromeos/network/network_state_list_detailed_view.h" 122a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "ash/system/tray/system_tray.h" 135821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ash/system/tray/system_tray_delegate.h" 142a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "ash/system/tray/system_tray_notifier.h" 155821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ash/system/tray/tray_constants.h" 165821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ash/system/tray/tray_item_more.h" 17c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles)#include "ash/system/tray/tray_popup_label_button.h" 182a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "base/command_line.h" 192a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "chromeos/network/network_state.h" 202a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "chromeos/network/network_state_handler.h" 215821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "grit/ash_strings.h" 222a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "third_party/cros_system_api/dbus/service_constants.h" 232a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)#include "ui/base/l10n/l10n_util.h" 245821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)#include "ui/base/resource/resource_bundle.h" 255821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 262a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)using chromeos::NetworkState; 272a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)using chromeos::NetworkStateHandler; 282a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 292a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)namespace { 302a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 312a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)bool UseNewNetworkHandlers() { 322a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) return !CommandLine::ForCurrentProcess()->HasSwitch( 332a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) ash::switches::kAshDisableNewNetworkStatusArea) && 342a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) NetworkStateHandler::IsInitialized(); 352a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)} 362a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 372a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)} 382a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 395821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)namespace ash { 405821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)namespace internal { 415821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 425821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)namespace tray { 435821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 442a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)class VpnDefaultView : public TrayItemMore, 452a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) public network_icon::AnimationObserver { 465821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) public: 475821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) VpnDefaultView(SystemTrayItem* owner, bool show_more) 485821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) : TrayItemMore(owner, show_more) { 495821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) Update(); 502a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 512a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 522a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) virtual ~VpnDefaultView() { 532a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (UseNewNetworkHandlers()) 542a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); 555821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 565821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 572a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) static bool ShouldShow() { 582a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) // Do not show VPN line in uber tray bubble if VPN is not configured. 592a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (UseNewNetworkHandlers()) { 602a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) NetworkStateHandler* handler = NetworkStateHandler::Get(); 612a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) const NetworkState* vpn = handler->FirstNetworkByType( 622a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) flimflam::kTypeVPN); 632a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) return vpn != NULL; 642a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } else { 652a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) std::vector<NetworkIconInfo> list; 662a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(&list); 672a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) return list.size() != 0; 682a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 692a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 705821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 715821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) void Update() { 722a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (UseNewNetworkHandlers()) { 732a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) gfx::ImageSkia image; 74c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) base::string16 label; 75c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) bool animating = false; 76c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) GetNetworkStateHandlerImageAndLabel(&image, &label, &animating); 77c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) if (animating) 78c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); 79c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) else 80c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); 812a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) SetImage(&image); 822a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) SetLabel(label); 832a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) SetAccessibleName(label); 842a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } else { 852a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) NetworkIconInfo info; 862a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) Shell::GetInstance()->system_tray_delegate()-> 872a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) GetVirtualNetworkIcon(&info); 882a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) SetImage(&info.image); 892a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) SetLabel(info.description); 902a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) SetAccessibleName(info.description); 912a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 922a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 932a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 942a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) // network_icon::AnimationObserver 952a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) virtual void NetworkIconChanged() OVERRIDE { 962a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) Update(); 975821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 985821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 995821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) private: 1002a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) void GetNetworkStateHandlerImageAndLabel(gfx::ImageSkia* image, 101c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) base::string16* label, 102c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) bool* animating) { 1032a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) NetworkStateHandler* handler = NetworkStateHandler::Get(); 1042a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) const NetworkState* vpn = handler->FirstNetworkByType( 1052a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) flimflam::kTypeVPN); 1062a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (!vpn || (vpn->connection_state() == flimflam::kStateIdle)) { 1072a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) *image = network_icon::GetImageForDisconnectedNetwork( 1082a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) network_icon::ICON_TYPE_DEFAULT_VIEW, flimflam::kTypeVPN); 1092a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (label) { 1102a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) *label = l10n_util::GetStringUTF16( 1112a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED); 1122a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 113c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) *animating = false; 1142a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) return; 1152a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 116c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) *animating = vpn->IsConnectingState(); 1172a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) *image = network_icon::GetImageForNetwork( 1182a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) vpn, network_icon::ICON_TYPE_DEFAULT_VIEW); 1192a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (label) { 1202a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) *label = network_icon::GetLabelForNetwork( 1212a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) vpn, network_icon::ICON_TYPE_DEFAULT_VIEW); 1222a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 1232a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 1242a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 1255821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) DISALLOW_COPY_AND_ASSIGN(VpnDefaultView); 1265821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)}; 1275821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1285821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)class VpnListDetailedView : public NetworkListDetailedViewBase { 1295821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) public: 1302a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) VpnListDetailedView(SystemTrayItem* owner, 1312a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) user::LoginStatus login, 1322a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) int header_string_id) 1332a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) : NetworkListDetailedViewBase(owner, login, header_string_id), 1342a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) other_vpn_(NULL), 1352a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) no_networks_view_(NULL) { 1365821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1372a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 1385821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual ~VpnListDetailedView() { 1395821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1405821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1415821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) // Overridden from NetworkListDetailedViewBase: 1425821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1435821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual void AppendHeaderButtons() OVERRIDE { 1445821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) AppendInfoButtonToHeader(); 1455821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1465821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1475821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual void UpdateHeaderButtons() OVERRIDE { 1485821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) UpdateSettingButton(); 1495821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1505821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1515821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual void AppendNetworkEntries() OVERRIDE { 1525821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) CreateScrollableList(); 1535821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1545821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1555821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual void GetAvailableNetworkList( 1565821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) std::vector<NetworkIconInfo>* list) OVERRIDE{ 1572a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(list); 1585821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1595821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1605821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual void UpdateNetworkEntries() OVERRIDE { 1615821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) RefreshNetworkScrollWithUpdatedNetworkData(); 1625821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1635821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1645821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual void AppendCustomButtonsToBottomRow( 1652a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) views::View* bottom_row) OVERRIDE { 1662a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) other_vpn_ = new TrayPopupLabelButton( 1675821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) this, 1685821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) ui::ResourceBundle::GetSharedInstance().GetLocalizedString( 1695821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) IDS_ASH_STATUS_TRAY_OTHER_VPN)); 1702a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) bottom_row->AddChildView(other_vpn_); 1715821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1725821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1735821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual void UpdateNetworkExtra() OVERRIDE { 1745821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) if (login() == user::LOGGED_IN_LOCKED) 1755821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) return; 1765821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1775821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1785821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual void CustomButtonPressed(views::Button* sender, 1795821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) const ui::Event& event) OVERRIDE { 1805821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) if (sender == other_vpn_) 1812a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) ash::Shell::GetInstance()->system_tray_delegate()->ShowOtherVPN(); 1825821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) else 1835821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) NOTREACHED(); 1845821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1855821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1865821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) virtual bool CustomLinkClickedOn(views::View* sender) OVERRIDE { 1875821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) return false; 1885821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) } 1895821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 1902a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) virtual bool UpdateNetworkListEntries( 1912a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) std::set<std::string>* new_service_paths) OVERRIDE { 1922a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 1932a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) bool needs_relayout = false; 1942a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 1952a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) int index = 0; 1962a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 1972a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) for (size_t i = 0; i < network_list().size(); ++i) { 1982a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) const NetworkIconInfo* info = &network_list()[i]; 1992a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (UpdateNetworkChild(index++, info)) 2002a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) needs_relayout = true; 2012a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) new_service_paths->insert(info->service_path); 2022a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 2032a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 2042a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) // We shouldn't be showing this list if there are no VPNs, but it could 2052a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) // be possible to get here if a VPN were removed (e.g. by a policy) while 2062a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) // the UI was open. Better to show something than nothing. 2072a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (network_list().empty()) { 2082a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (CreateOrUpdateInfoLabel( 2092a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) index++, 2102a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_NETWORK_NO_VPN), 2112a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) &no_networks_view_)) { 2122a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) needs_relayout = true; 2132a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 2142a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 2152a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 2162a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) return needs_relayout; 2172a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 2182a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 2195821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) private: 2202a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) TrayPopupLabelButton* other_vpn_; 2212a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) views::Label* no_networks_view_; 2225821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2235821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) DISALLOW_COPY_AND_ASSIGN(VpnListDetailedView); 2245821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)}; 2255821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2265821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} // namespace tray 2275821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2282a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)TrayVPN::TrayVPN(SystemTray* system_tray) 2292a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) : SystemTrayItem(system_tray), 2302a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) default_(NULL), 2315821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) detailed_(NULL) { 2322a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (UseNewNetworkHandlers()) 2332a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) network_state_observer_.reset(new TrayNetworkStateObserver(this)); 2342a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) Shell::GetInstance()->system_tray_notifier()->AddVpnObserver(this); 2355821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2365821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2375821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)TrayVPN::~TrayVPN() { 2382a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) Shell::GetInstance()->system_tray_notifier()->RemoveVpnObserver(this); 2395821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2405821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2415821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)views::View* TrayVPN::CreateTrayView(user::LoginStatus status) { 2425821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) return NULL; 2435821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2445821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2455821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) { 2465821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) CHECK(default_ == NULL); 2475821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) if (status == user::LOGGED_IN_NONE) 2485821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) return NULL; 2495821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2502a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (!tray::VpnDefaultView::ShouldShow()) 2512a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) return NULL; 2522a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 2535821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) default_ = new tray::VpnDefaultView(this, status != user::LOGGED_IN_LOCKED); 2545821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) return default_; 2555821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2565821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2575821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)views::View* TrayVPN::CreateDetailedView(user::LoginStatus status) { 2585821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) CHECK(detailed_ == NULL); 2592a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 2602a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (UseNewNetworkHandlers()) { 2612a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) detailed_ = new tray::NetworkStateListDetailedView( 2622a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) this, tray::NetworkStateListDetailedView::LIST_TYPE_VPN, status); 2632a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } else { 2642a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) detailed_ = new tray::VpnListDetailedView( 2652a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) this, status, IDS_ASH_STATUS_TRAY_VPN); 2662a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 2675821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) detailed_->Init(); 2685821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) return detailed_; 2695821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2705821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2715821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)views::View* TrayVPN::CreateNotificationView(user::LoginStatus status) { 2725821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) return NULL; 2735821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2745821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2755821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::DestroyTrayView() { 2765821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2775821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2785821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::DestroyDefaultView() { 2795821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) default_ = NULL; 2805821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2815821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2825821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::DestroyDetailedView() { 2835821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) detailed_ = NULL; 2845821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2855821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2865821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::DestroyNotificationView() { 2875821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2885821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2895821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::UpdateAfterLoginStatusChange(user::LoginStatus status) { 2905821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2915821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2925821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { 2935821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 2945821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 2955821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::OnNetworkRefresh(const NetworkIconInfo& info) { 2962a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (default_) { 2975821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) default_->Update(); 2982a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } else if (tray::VpnDefaultView::ShouldShow()) { 2992a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (system_tray()->HasSystemBubbleType( 3002a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) SystemTrayBubble::BUBBLE_TYPE_DEFAULT)) { 3012a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) // We created the default view without a VPN view, so rebuild it. 3022a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING); 3032a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 3042a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 3052a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 3065821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) if (detailed_) 3072a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) detailed_->ManagerChanged(); 3085821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 3095821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 3105821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::SetNetworkMessage(NetworkTrayDelegate* delegate, 3115821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) MessageType message_type, 3122a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) NetworkType network_type, 313c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) const base::string16& title, 314c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) const base::string16& message, 315c2e0dbddbe15c98d52c4786dac06cb8952a8ae6dTorne (Richard Coles) const std::vector<base::string16>& links) { 3165821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 3175821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 3185821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::ClearNetworkMessage(MessageType message_type) { 3195821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 3205821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 3215821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)void TrayVPN::OnWillToggleWifi() { 3225821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} 3235821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 3242a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)void TrayVPN::NetworkStateChanged(bool list_changed) { 3252a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (default_) 3262a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) default_->Update(); 3272a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (detailed_) { 3282a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (list_changed) 3292a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) detailed_->NetworkListChanged(); 3302a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) else 3312a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) detailed_->ManagerChanged(); 3322a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) } 3332a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)} 3342a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 3352a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)void TrayVPN::NetworkServiceChanged(const chromeos::NetworkState* network) { 3362a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) if (detailed_) 3372a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) detailed_->NetworkServiceChanged(network); 3382a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)} 3392a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles) 3405821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} // namespace internal 3415821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)} // namespace ash 342