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

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

Issue 2522613004: Revert of chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: Created 4 years, 1 month 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 | « chrome/browser/ui/ash/system_tray_client.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 a29dc9e41e570d387e5185d7056f4b438320988e..ddb870f4be3b87af1f9f9edd3c0824a666f88782 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -42,6 +42,7 @@
namespace ash {
class SystemTrayNotifier;
+class VPNDelegate;
}
namespace user_manager {
@@ -114,6 +115,7 @@
ash::CustodianInfoTrayObserver* observer) override;
void RemoveCustodianInfoTrayObserver(
ash::CustodianInfoTrayObserver* observer) override;
+ ash::VPNDelegate* GetVPNDelegate() const override;
std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem(
ash::SystemTray* tray) override;
@@ -242,6 +244,7 @@
std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
+ std::unique_ptr<ash::VPNDelegate> vpn_delegate_;
base::ObserverList<ash::CustodianInfoTrayObserver>
custodian_info_changed_observers_;
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client.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