Use mojo SystemTray interfaces for both mash and classic ash

chrome/browser/ui/ash/chrome_shell_delegate.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/chrome_shell_delegate.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 55 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
+#include "content/public/common/mojo_shell_connection.h"
 #include "ui/app_list/presenter/app_list_presenter.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using chromeos::AccessibilityManager;
 
 namespace {
 
@@ skipping 231 matching lines @@
 }  // namespace
 
 ChromeShellDelegate::ChromeShellDelegate()
     : shelf_delegate_(NULL) {
   PlatformInit();
 }
 
 ChromeShellDelegate::~ChromeShellDelegate() {
 }
 
+shell::Connector* ChromeShellDelegate::GetShellConnector() const {
+  return content::MojoShellConnection::GetForProcess()->GetConnector();
+}
+
 bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kFirstExecAfterBoot);
 }
 
 bool ChromeShellDelegate::IsMultiProfilesEnabled() const {
   if (!profiles::IsMultipleProfilesEnabled())
     return false;
   // If there is a user manager, we need to see that we can at least have 2
   // simultaneous users to allow this feature.
@@ skipping 211 matching lines @@
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 void ChromeShellDelegate::PlatformInit() {
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
 }