Use mojo SystemTray interfaces for both mash and classic ash

ash/mus/window_manager.cc

 // Copyright 2015 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/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 59 matching lines @@
       NonClientFrameController::GetPreferredClientAreaInsets();
   frame_decoration_values->normal_client_area_insets = client_area_insets;
   frame_decoration_values->maximized_client_area_insets = client_area_insets;
   frame_decoration_values->max_title_bar_button_width =
       NonClientFrameController::GetMaxTitleBarButtonWidth();
   window_manager_client_->SetFrameDecorationValues(
       std::move(frame_decoration_values));
 
   shell_.reset(new WmShellMus(base::MakeUnique<ShellDelegateMus>(connector_),
                               this, pointer_watcher_event_router_.get()));
-  shell_->Initialize(blocking_pool);
+  shell_->Initialize(blocking_pool, connector_);
   lookup_.reset(new WmLookupMus);
 }
 
 void WindowManager::SetScreenLocked(bool is_locked) {
   // TODO: screen locked state needs to be persisted for newly added displays.
   for (auto& root_window_controller : root_window_controllers_) {
     WmWindowMus* non_lock_screen_containers_container =
         root_window_controller->GetWindowByShellWindowId(
             kShellWindowId_NonLockScreenContainersContainer);
     non_lock_screen_containers_container->mus_window()->SetVisible(!is_locked);
@@ skipping 237 matching lines @@
                                                     const ui::Event& event) {
   auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id));
   if (iter == accelerator_handlers_.end())
     return ui::mojom::EventResult::HANDLED;
 
   return iter->second->OnAccelerator(id, event);
 }
 
 }  // namespace mus
 }  // namespace ash