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

Unified Diff: ash/mus/system_tray_delegate_mus.h

Issue 2378193002: mustash: Show networking items in ash system tray (Closed)
Patch Set: typo Created 4 years, 3 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
Index: ash/mus/system_tray_delegate_mus.h
diff --git a/ash/mus/system_tray_delegate_mus.h b/ash/mus/system_tray_delegate_mus.h
index 814ffdde13c4a0b8535a5fcb52b9b734dcf4587f..e4dc6efe2b0ba7774890ca0e421affd23fb4f69d 100644
--- a/ash/mus/system_tray_delegate_mus.h
+++ b/ash/mus/system_tray_delegate_mus.h
@@ -5,6 +5,8 @@
#ifndef ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_
#define ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_
+#include <memory>
+
#include "ash/common/system/tray/default_system_tray_delegate.h"
#include "ash/public/interfaces/system_tray.mojom.h"
#include "base/i18n/time_formatting.h"
@@ -16,10 +18,15 @@ class Connector;
namespace ash {
+class NetworkingConfigDelegate;
+class VPNDelegate;
+
// Handles the settings displayed in the system tray menu. For mus most settings
// are obtained from chrome browser via mojo IPC. For the classic ash version
// see SystemTrayDelegateChromeOS.
//
+// Chrome OS only. Other platforms use DefaultSystemTrayDelegate directly.
+//
// TODO: Support all methods in SystemTrayDelegate. http://crbug.com/647412.
class SystemTrayDelegateMus : public DefaultSystemTrayDelegate,
public mojom::SystemTray {
@@ -54,6 +61,8 @@ class SystemTrayDelegateMus : public DefaultSystemTrayDelegate,
void ShowPublicAccountInfo() override;
void ShowEnterpriseInfo() override;
void ShowProxySettings() override;
+ NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
+ VPNDelegate* GetVPNDelegate() const override;
// mojom::SystemTray:
void SetUse24HourClock(bool use_24_hour) override;
@@ -67,6 +76,9 @@ class SystemTrayDelegateMus : public DefaultSystemTrayDelegate,
// 12 or 24 hour display.
base::HourClockType hour_clock_type_;
+ std::unique_ptr<NetworkingConfigDelegate> networking_config_delegate_;
+ std::unique_ptr<VPNDelegate> vpn_delegate_;
+
DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus);
};

Powered by Google App Engine
This is Rietveld 408576698