Use mojo SystemTray interfaces for both mash and classic ash

ash/common/shell_delegate.h

 // Copyright (c) 2012 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_COMMON_SHELL_DELEGATE_H_
 #define ASH_COMMON_SHELL_DELEGATE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 13 matching lines @@
 }
 
 namespace keyboard {
 class KeyboardUI;
 }
 
 namespace ui {
 class MenuModel;
 }
 
+namespace shell {
+class Connector;
+}
+
 namespace views {
 class Widget;
 }
 
 namespace ash {
 
 class AccessibilityDelegate;
 class GPUSupport;
 class MediaDelegate;
 class NewWindowDelegate;
 class PaletteDelegate;
 class SessionStateDelegate;
 class ShelfDelegate;
 class ShelfModel;
 class SystemTrayDelegate;
 struct ShelfItem;
 class WallpaperDelegate;
 class WmShelf;
 class WmWindow;
 
 // Delegate of the Shell.
 class ASH_EXPORT ShellDelegate {
  public:
   // The Shell owns the delegate.
   virtual ~ShellDelegate() {}
 
+  // Returns the connector for the mojo service manager. Returns null in tests.
+  virtual ::shell::Connector* GetShellConnector() const = 0;
+
   // Returns true if this is the first time that the shell has been run after
   // the system has booted.  false is returned after the shell has been
   // restarted, typically due to logging in as a guest or logging out.
   virtual bool IsFirstRunAfterBoot() const = 0;
 
   // Returns true if multi-profiles feature is enabled.
   virtual bool IsMultiProfilesEnabled() const = 0;
 
   // Returns true if incognito mode is allowed for the user.
   // Incognito windows are restricted for supervised users.
@@ skipping 71 matching lines @@
   virtual gfx::Image GetDeprecatedAcceleratorImage() const = 0;
 
   // Toggles the status of the touchpad / touchscreen on or off.
   virtual void ToggleTouchpad() {}
   virtual void ToggleTouchscreen() {}
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELL_DELEGATE_H_