| 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 001bb6dd3fef611c810f37fc17298506e26fd953..c78abd84154ac13385bb602b3b1805204ddd3648 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -73,6 +73,7 @@
|
| #include "chrome/browser/ui/ash/system_tray_delegate_utils.h"
|
| #include "chrome/browser/ui/ash/user_accounts_delegate_chromeos.h"
|
| #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
|
| +#include "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| @@ -204,6 +205,7 @@ SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
|
| kSystemUse24HourClock,
|
| base::Bind(&SystemTrayDelegateChromeOS::UpdateClockType,
|
| base::Unretained(this)))),
|
| + 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().
|
| @@ -862,6 +864,10 @@ void SystemTrayDelegateChromeOS::ShouldRebootOnShutdown(
|
| shutdown_policy_handler_->CheckIfRebootOnShutdown(callback);
|
| }
|
|
|
| +ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const {
|
| + return vpn_delegate_.get();
|
| +}
|
| +
|
| void SystemTrayDelegateChromeOS::UserAddedToSession(
|
| const user_manager::User* active_user) {
|
| }
|
|
|