mustash: Show networking items in ash system tray

ash/mus/system_tray_delegate_mus.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/macros.h"
 
 namespace shell {
 class Connector;
 }
 
 namespace ash {
 
+class NetworkingConfigDelegate;
+class VPNDelegate;

[msw, 2016/09/28 22:19:54]

optional nit: if the fwd decl suffices, make vpn_delegate_ a member even if
!OS_CHROMEOS, and return its default null value in GetVPNDelegate (just to
eliminate a coulple preprocessor blocks). Otherwise maybe put this in an
OS_CHROMEOS block too.

[James Cook, 2016/09/29 16:45:39]

Actually, I went the other way and made this whole file chromeos-only. That's
more like what classic ash does -- the only interesting implementation of
SystemTrayDelegate is SystemTrayDelegateChromeos. Other platforms get
DefaultSystemTrayDelegate.

Also, SystemTrayDelegateMus expects to find a mojo:SystemTrayClient interface
from chrome, but that interface is only provided by chrome on chromeos.

+
 // 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.
 //
 // TODO: Support all methods in SystemTrayDelegate. http://crbug.com/647412.
 class SystemTrayDelegateMus : public DefaultSystemTrayDelegate,
                               public mojom::SystemTray {
  public:
   explicit SystemTrayDelegateMus(shell::Connector* connector);
   ~SystemTrayDelegateMus() override;
@@ skipping 18 matching lines @@
   void ShowChromeSlow() override;
   void ShowIMESettings() override;
   void ShowHelp() override;
   void ShowAccessibilityHelp() override;
   void ShowAccessibilitySettings() override;
   void ShowPaletteHelp() override;
   void ShowPaletteSettings() override;
   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;
 
   // May be null in unit tests.
   shell::Connector* connector_;
 
   // Client interface in chrome browser.
   mojom::SystemTrayClientPtr system_tray_client_;
 
   // 12 or 24 hour display.
   base::HourClockType hour_clock_type_;
 
+  std::unique_ptr<NetworkingConfigDelegate> networking_config_delegate_;
+
+#if defined(OS_CHROMEOS)
+  std::unique_ptr<VPNDelegate> vpn_delegate_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus);
 };
 
 }  // namespace ash
 
 #endif  // ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_