Use mojo SystemTray interfaces for both mash and classic ash

chrome/browser/ui/ash/ash_init.cc

 // 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.
 
 #include "chrome/browser/ui/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/wm_shell.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
+#include "content/public/common/mojo_shell_connection.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"  // nogncheck
 #endif
 
 namespace chrome {
 
 void OpenAsh(gfx::AcceleratedWidget remote_window) {
@@ skipping 11 matching lines @@
     ash::Shell::set_initially_hide_cursor(true);
 
   // Balanced by a call to DestroyInstance() in CloseAsh() below.
   ash::ShellContentState::SetInstance(new ChromeShellContentState);
 
   ash::ShellInitParams shell_init_params;
   // Shell takes ownership of ChromeShellDelegate.
   shell_init_params.delegate = new ChromeShellDelegate;
   shell_init_params.context_factory = content::GetContextFactory();
   shell_init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
+  shell_init_params.connector =
+      content::MojoShellConnection::GetForProcess()->GetConnector();
+  DCHECK(shell_init_params.connector);
 
   ash::Shell* shell = ash::Shell::CreateInstance(shell_init_params);
   shell->accelerator_controller_delegate()->SetScreenshotDelegate(
       std::unique_ptr<ash::ScreenshotDelegate>(new ChromeScreenshotGrabber));
   // TODO(flackr): Investigate exposing a blocking pool task runner to chromeos.
   chromeos::AccelerometerReader::GetInstance()->Initialize(
       content::BrowserThread::GetBlockingPool()
           ->GetSequencedTaskRunnerWithShutdownBehavior(
               content::BrowserThread::GetBlockingPool()->GetSequenceToken(),
               base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
@@ skipping 25 matching lines @@
 }
 
 void CloseAsh() {
   if (ash::Shell::HasInstance()) {
     ash::Shell::DeleteInstance();
     ash::ShellContentState::DestroyInstance();
   }
 }
 
 }  // namespace chrome