Use mojo SystemTray interfaces for both mash and classic ash

ash/mus/system_tray_delegate_mus.h

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
deleted file mode 100644
index 814ffdde13c4a0b8535a5fcb52b9b734dcf4587f..0000000000000000000000000000000000000000
--- a/ash/mus/system_tray_delegate_mus.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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 "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 {
-
-// 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;
-
-  static SystemTrayDelegateMus* Get();
-
- private:
-  // Connects or reconnects to the mojom::SystemTrayClient interface and returns
-  // the interface pointer.
-  mojom::SystemTrayClient* ConnectToSystemTrayClient();
-
-  // Handles errors on the |system_tray_client_| interface connection.
-  void OnClientConnectionError();
-
-  // SystemTrayDelegate:
-  base::HourClockType GetHourClockType() const override;
-  void ShowSettings() override;
-  void ShowDateSettings() override;
-  void ShowNetworkSettingsForGuid(const std::string& guid) override;
-  void ShowDisplaySettings() override;
-  void ShowPowerSettings() override;
-  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;
-
-  // 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_;
-
-  DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus);
-};
-
-}  // namespace ash
-
-#endif  // ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_