| 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
|
| index 674e1af670b68301858ef46039e2318cefaac50e..43512a6966677504249c247ba5e787c506b6f797 100644
|
| --- a/ash/system/chromeos/network/tray_vpn.cc
|
| +++ b/ash/system/chromeos/network/tray_vpn.cc
|
| @@ -40,8 +40,10 @@ class VpnDefaultView : public TrayItemMore {
|
|
|
| class VpnListDetailedView : public NetworkListDetailedViewBase {
|
| public:
|
| - VpnListDetailedView(user::LoginStatus login, int header_string_id)
|
| - : NetworkListDetailedViewBase(login, header_string_id),
|
| + VpnListDetailedView(SystemTrayItem* owner,
|
| + user::LoginStatus login,
|
| + int header_string_id)
|
| + : NetworkListDetailedViewBase(owner, login, header_string_id),
|
| other_vpn_(NULL) {
|
| }
|
| virtual ~VpnListDetailedView() {
|
| @@ -116,8 +118,9 @@ class VpnListDetailedView : public NetworkListDetailedViewBase {
|
|
|
| } // namespace tray
|
|
|
| -TrayVPN::TrayVPN()
|
| - : default_(NULL),
|
| +TrayVPN::TrayVPN(SystemTray* system_tray)
|
| + : SystemTrayItem(system_tray),
|
| + default_(NULL),
|
| detailed_(NULL) {
|
| }
|
|
|
| @@ -145,7 +148,8 @@ views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
|
|
|
| views::View* TrayVPN::CreateDetailedView(user::LoginStatus status) {
|
| CHECK(detailed_ == NULL);
|
| - detailed_ = new tray::VpnListDetailedView(status, IDS_ASH_STATUS_TRAY_VPN);
|
| + detailed_ = new tray::VpnListDetailedView(
|
| + this, status, IDS_ASH_STATUS_TRAY_VPN);
|
| detailed_->Init();
|
| return detailed_;
|
| }
|
|
|