Use mojo SystemTray interfaces for both mash and classic ash

ash/common/system/date/date_view.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 "ash/common/system/date/date_view.h"
 
+#include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_shell.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "grit/ash_strings.h"
 #include "third_party/icu/source/i18n/unicode/datefmt.h"
@@ skipping 67 matching lines @@
   SetTimer(now);
 }
 
 void BaseDateTimeView::GetAccessibleState(ui::AXViewState* state) {
   ActionableView::GetAccessibleState(state);
   state->role = ui::AX_ROLE_TIME;
 }
 
 BaseDateTimeView::BaseDateTimeView(SystemTrayItem* owner)
     : ActionableView(owner),
-      hour_type_(WmShell::Get()->system_tray_delegate()->GetHourClockType()) {
+      hour_type_(WmShell::Get()->system_tray_controller()->hour_clock_type()) {
   SetTimer(base::Time::Now());
   SetFocusBehavior(FocusBehavior::NEVER);
 }
 
 void BaseDateTimeView::SetTimer(const base::Time& now) {
   // Try to set the timer to go off at the next change of the minute. We don't
   // want to have the timer go off more than necessary since that will cause
   // the CPU to wake up and consume power.
   base::Time::Exploded exploded;
   now.LocalExplode(&exploded);
@@ skipping 52 matching lines @@
                                      ? kHeaderTextColorNormal
                                      : kHeaderTextColorHover);
     SchedulePaint();
   }
   action_ = action;
   SetFocusBehavior(action_ != TrayDate::NONE ? FocusBehavior::ALWAYS
                                              : FocusBehavior::NEVER);
 }
 
 void DateView::UpdateTimeFormat() {
-  hour_type_ = WmShell::Get()->system_tray_delegate()->GetHourClockType();
+  hour_type_ = WmShell::Get()->system_tray_controller()->hour_clock_type();
   UpdateText();
 }
 
 base::HourClockType DateView::GetHourTypeForTesting() const {
   return hour_type_;
 }
 
 void DateView::SetActive(bool active) {
   date_label_->SetEnabledColor(active ? kHeaderTextColorHover
                                       : kHeaderTextColorNormal);
   SchedulePaint();
 }
 
 void DateView::UpdateTextInternal(const base::Time& now) {
   BaseDateTimeView::UpdateTextInternal(now);
   date_label_->SetText(l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_DATE, FormatDayOfWeek(now), FormatDate(now)));
 }
 
 bool DateView::PerformAction(const ui::Event& event) {
   if (action_ == TrayDate::NONE)
     return false;
   if (action_ == TrayDate::SHOW_DATE_SETTINGS)
-    WmShell::Get()->system_tray_delegate()->ShowDateSettings();
+    WmShell::Get()->system_tray_controller()->ShowDateSettings();
   else if (action_ == TrayDate::SET_SYSTEM_TIME)
     WmShell::Get()->system_tray_delegate()->ShowSetTimeDialog();
   else
     return false;
   CloseSystemBubble();
   return true;
 }
 
 void DateView::OnMouseEntered(const ui::MouseEvent& event) {
   if (action_ == TrayDate::NONE)
@@ skipping 22 matching lines @@
 TimeView::TimeView(TrayDate::ClockLayout clock_layout)
     : BaseDateTimeView(nullptr) {
   SetupLabels();
   UpdateTextInternal(base::Time::Now());
   UpdateClockLayout(clock_layout);
 }
 
 TimeView::~TimeView() {}
 
 void TimeView::UpdateTimeFormat() {
-  hour_type_ = WmShell::Get()->system_tray_delegate()->GetHourClockType();
+  hour_type_ = WmShell::Get()->system_tray_controller()->hour_clock_type();
   UpdateText();
 }
 
 base::HourClockType TimeView::GetHourTypeForTesting() const {
   return hour_type_;
 }
 
 void TimeView::UpdateTextInternal(const base::Time& now) {
   // Just in case |now| is null, do NOT update time; otherwise, it will
   // crash icu code by calling into base::TimeFormatTimeOfDayWithHourClockType,
@@ skipping 84 matching lines @@
 }
 
 void TimeView::SetupLabel(views::Label* label) {
   label->set_owned_by_client();
   SetupLabelForTray(label);
   label->SetElideBehavior(gfx::NO_ELIDE);
 }
 
 }  // namespace tray
 }  // namespace ash