Use mojo SystemTray interfaces for both mash and classic ash

ash/common/wm_shell.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/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/ash_focus_manager_factory.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/new_window_delegate.h"
 #include "ash/common/palette_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/app_list_shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_window_watcher.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/brightness_control_delegate.h"
 #include "ash/common/system/keyboard_brightness_control_delegate.h"
 #include "ash/common/system/toast/toast_manager.h"
+#include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm/immersive_context_ash.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/system_modal_container_layout_manager.h"
@@ skipping 21 matching lines @@
 // static
 void WmShell::Set(WmShell* instance) {
   instance_ = instance;
 }
 
 // static
 WmShell* WmShell::Get() {
   return instance_;
 }
 
-void WmShell::Initialize(const scoped_refptr<base::SequencedWorkerPool>& pool) {
+void WmShell::Initialize(const scoped_refptr<base::SequencedWorkerPool>& pool,
+                         shell::Connector* connector) {
   blocking_pool_ = pool;
 
   // Some delegates access WmShell during their construction. Create them here
   // instead of the WmShell constructor.
   accessibility_delegate_.reset(delegate_->CreateAccessibilityDelegate());
   media_delegate_.reset(delegate_->CreateMediaDelegate());
   palette_delegate_ = delegate_->CreatePaletteDelegate();
   toast_manager_.reset(new ToastManager);
 
   // Create the app list item in the shelf data model.
   AppListShelfItemDelegate::CreateAppListItemAndDelegate(shelf_model_.get());
 
   // Install the custom factory early on so that views::FocusManagers for Tray,
   // Shelf, and WallPaper could be created by the factory.
   views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 
   new_window_delegate_.reset(delegate_->CreateNewWindowDelegate());
 
   wallpaper_controller_.reset(new WallpaperController(blocking_pool_));
+  system_tray_controller_.reset(new SystemTrayController(connector));
 }
 
 void WmShell::Shutdown() {
   // These members access WmShell in their destructors.
   wallpaper_controller_.reset();
   accessibility_delegate_.reset();
 
   // ShelfWindowWatcher has window observers and a pointer to the shelf model.
   shelf_window_watcher_.reset();
   // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC
@@ skipping 252 matching lines @@
 void WmShell::DeleteToastManager() {
   toast_manager_.reset();
 }
 
 void WmShell::SetAcceleratorController(
     std::unique_ptr<AcceleratorController> accelerator_controller) {
   accelerator_controller_ = std::move(accelerator_controller);
 }
 
 }  // namespace ash