Use mojo SystemTray interfaces for both mash and classic ash

ash/mus/system_tray_delegate_mus.cc

 // 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.
 
 #include "ash/mus/system_tray_delegate_mus.h"
 
 #include "ash/common/system/networking_config_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"

[msw, 2016/09/30 23:26:49]

nit: remove

[James Cook, 2016/10/03 18:07:56]

Done, here and below. Geez, I missed a lot of clean up. :-P  Sorry 'bout that.

 #include "ash/common/wm_shell.h"

[msw, 2016/09/30 23:26:49]

nit: remove

 #include "ash/mus/vpn_delegate_mus.h"
 #include "base/bind.h"

[msw, 2016/09/30 23:26:49]

nit: remove

 #include "base/bind_helpers.h"

[msw, 2016/09/30 23:26:49]

nit: remove

 #include "base/i18n/time_formatting.h"

[msw, 2016/09/30 23:26:49]

nit: remove

 #include "base/logging.h"

[msw, 2016/09/30 23:26:49]

nit: remove

 #include "services/shell/public/cpp/connector.h"

[msw, 2016/09/30 23:26:49]

nit: remove

 
 namespace ash {
 namespace {
 
-SystemTrayDelegateMus* g_instance = nullptr;
-
 // TODO(mash): Provide a real implementation, perhaps by folding its behavior
 // into an ash-side network information cache. http://crbug.com/651157
 class StubNetworkingConfigDelegate : public NetworkingConfigDelegate {
  public:
   StubNetworkingConfigDelegate() {}
   ~StubNetworkingConfigDelegate() override {}
 
  private:
   // NetworkingConfigDelegate:
   std::unique_ptr<const ExtensionInfo> LookUpExtensionForNetwork(
       const std::string& service_path) override {
     return nullptr;
   }
 
   DISALLOW_COPY_AND_ASSIGN(StubNetworkingConfigDelegate);
 };
 
 }  // namespace
 
-SystemTrayDelegateMus::SystemTrayDelegateMus(shell::Connector* connector)
-    : connector_(connector),
-      hour_clock_type_(base::GetHourClockType()),
-      networking_config_delegate_(new StubNetworkingConfigDelegate),
-      vpn_delegate_(new VPNDelegateMus) {
-  // Don't make an initial connection to exe:chrome. Do it on demand.
-  DCHECK(!g_instance);
-  g_instance = this;
-}
+SystemTrayDelegateMus::SystemTrayDelegateMus()
+    : networking_config_delegate_(new StubNetworkingConfigDelegate),
+      vpn_delegate_(new VPNDelegateMus) {}
 
 SystemTrayDelegateMus::~SystemTrayDelegateMus() {
-  DCHECK_EQ(this, g_instance);
-  g_instance = nullptr;
-}
-
-// static
-SystemTrayDelegateMus* SystemTrayDelegateMus::Get() {
-  return g_instance;
-}
-
-mojom::SystemTrayClient* SystemTrayDelegateMus::ConnectToSystemTrayClient() {
-  if (!system_tray_client_.is_bound()) {
-    // Connect (or reconnect) to the interface.
-    connector_->ConnectToInterface("exe:chrome", &system_tray_client_);
-
-    // Tolerate chrome crashing and coming back up.
-    system_tray_client_.set_connection_error_handler(
-        base::Bind(&SystemTrayDelegateMus::OnClientConnectionError,
-                   base::Unretained(this)));
-  }
-  return system_tray_client_.get();
-}
-
-void SystemTrayDelegateMus::OnClientConnectionError() {
-  system_tray_client_.reset();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// SystemTrayDelegate:
-
-base::HourClockType SystemTrayDelegateMus::GetHourClockType() const {
-  return hour_clock_type_;
-}
-
-void SystemTrayDelegateMus::ShowSettings() {
-  ConnectToSystemTrayClient()->ShowSettings();
-}
-
-void SystemTrayDelegateMus::ShowDateSettings() {
-  ConnectToSystemTrayClient()->ShowDateSettings();
-}
-
-void SystemTrayDelegateMus::ShowNetworkSettingsForGuid(
-    const std::string& guid) {
-  // http://crbug.com/647412
-  NOTIMPLEMENTED();
-}
-
-void SystemTrayDelegateMus::ShowDisplaySettings() {
-  ConnectToSystemTrayClient()->ShowDisplaySettings();
-}
-
-void SystemTrayDelegateMus::ShowPowerSettings() {
-  ConnectToSystemTrayClient()->ShowPowerSettings();
-}
-
-void SystemTrayDelegateMus::ShowChromeSlow() {
-  ConnectToSystemTrayClient()->ShowChromeSlow();
-}
-
-void SystemTrayDelegateMus::ShowIMESettings() {
-  ConnectToSystemTrayClient()->ShowIMESettings();
-}
-
-void SystemTrayDelegateMus::ShowHelp() {
-  ConnectToSystemTrayClient()->ShowHelp();
-}
-
-void SystemTrayDelegateMus::ShowAccessibilityHelp() {
-  ConnectToSystemTrayClient()->ShowAccessibilityHelp();
-}
-
-void SystemTrayDelegateMus::ShowAccessibilitySettings() {
-  ConnectToSystemTrayClient()->ShowAccessibilitySettings();
-}
-
-void SystemTrayDelegateMus::ShowPaletteHelp() {
-  ConnectToSystemTrayClient()->ShowPaletteHelp();
-}
-
-void SystemTrayDelegateMus::ShowPaletteSettings() {
-  ConnectToSystemTrayClient()->ShowPaletteSettings();
-}
-
-void SystemTrayDelegateMus::ShowPublicAccountInfo() {
-  ConnectToSystemTrayClient()->ShowPublicAccountInfo();
-}
-
-void SystemTrayDelegateMus::ShowEnterpriseInfo() {
-  // http://crbug.com/647412
-  NOTIMPLEMENTED();
-}
-
-void SystemTrayDelegateMus::ShowProxySettings() {
-  ConnectToSystemTrayClient()->ShowProxySettings();
 }
 
 NetworkingConfigDelegate* SystemTrayDelegateMus::GetNetworkingConfigDelegate()
     const {
   return networking_config_delegate_.get();
 }
 
 VPNDelegate* SystemTrayDelegateMus::GetVPNDelegate() const {
   return vpn_delegate_.get();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// mojom::SystemTray:
-
-void SystemTrayDelegateMus::SetUse24HourClock(bool use_24_hour) {
-  hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock;
-  WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged();
-}
-
 }  // namespace ash