| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| index d07ce2fa923a24906645d66ff2193cbaebc095d7..10d7a7f22ed3a50c7def9fcd640bff0bacb9bdc1 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -59,6 +59,7 @@
|
| #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h"
|
| #include "chrome/browser/ui/ash/system_tray_client.h"
|
| #include "chrome/browser/ui/ash/system_tray_delegate_utils.h"
|
| +#include "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/chrome_pages.h"
|
| @@ -144,6 +145,7 @@
|
| SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
|
| : cast_config_delegate_(base::MakeUnique<CastConfigDelegateMediaRouter>()),
|
| networking_config_delegate_(new NetworkingConfigDelegateChromeos()),
|
| + vpn_delegate_(new VPNDelegateChromeOS),
|
| weak_ptr_factory_(this) {
|
| // Register notifications on construction so that events such as
|
| // PROFILE_CREATED do not get missed if they happen before Initialize().
|
| @@ -586,6 +588,10 @@
|
| void SystemTrayDelegateChromeOS::RemoveCustodianInfoTrayObserver(
|
| ash::CustodianInfoTrayObserver* observer) {
|
| custodian_info_changed_observers_.RemoveObserver(observer);
|
| +}
|
| +
|
| +ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const {
|
| + return vpn_delegate_.get();
|
| }
|
|
|
| std::unique_ptr<ash::SystemTrayItem>
|
|
|