Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 984863005: Add ash::VPNDelegate and Chrome OS implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed crash during device-local account login. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray/system_tray_delegate.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index b250503f8757549f8de9e191d4850833d17c2029..0e4f2cd34365381a60ed8d199afba810f8031443 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -39,6 +39,10 @@
#include "ui/base/ime/chromeos/input_method_manager.h"
#include "ui/chromeos/ime/input_method_menu_manager.h"
+namespace ash {
+class VPNDelegate;
+}
+
namespace user_manager {
class User;
}
@@ -142,6 +146,7 @@ class SystemTrayDelegateChromeOS
ash::ShutdownPolicyObserver* observer) override;
void ShouldRebootOnShutdown(
const ash::RebootOnShutdownCallback& callback) override;
+ ash::VPNDelegate* GetVPNDelegate() const override;
// Overridden from user_manager::UserManager::UserSessionStateObserver:
void UserAddedToSession(const user_manager::User* active_user) override;
@@ -293,6 +298,7 @@ class SystemTrayDelegateChromeOS
base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
accounts_delegates_;
scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
+ scoped_ptr<ash::VPNDelegate> vpn_delegate_;
ObserverList<ash::CustodianInfoTrayObserver>
custodian_info_changed_observers_;
« no previous file with comments | « ash/system/tray/system_tray_delegate.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698