Move more from WmShell to Shell

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/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tray_utils.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.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 "third_party/icu/source/i18n/unicode/datefmt.h"
 #include "third_party/icu/source/i18n/unicode/dtptngen.h"
 #include "third_party/icu/source/i18n/unicode/smpdtfmt.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 85 matching lines @@
   SetTimer(now);
 }
 
 void BaseDateTimeView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   ActionableView::GetAccessibleNodeData(node_data);
   node_data->role = ui::AX_ROLE_TIME;
 }
 
 BaseDateTimeView::BaseDateTimeView(SystemTrayItem* owner)
     : ActionableView(owner, TrayPopupInkDropStyle::INSET_BOUNDS),
-      hour_type_(WmShell::Get()->system_tray_controller()->hour_clock_type()) {
+      hour_type_(Shell::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 76 matching lines @@
   // Disable |this| when not clickable so that the material design ripple is
   // not shown.
   if (UseMd()) {
     SetEnabled(action_ != DateAction::NONE);
     if (action_ != DateAction::NONE)
       SetInkDropMode(views::InkDropHostView::InkDropMode::ON);
   }
 }
 
 void DateView::UpdateTimeFormat() {
-  hour_type_ = WmShell::Get()->system_tray_controller()->hour_clock_type();
+  hour_type_ = Shell::Get()->system_tray_controller()->hour_clock_type();
   UpdateText();
 }
 
 base::HourClockType DateView::GetHourTypeForTesting() const {
   return hour_type_;
 }
 
 void DateView::SetActive(bool active) {
   if (UseMd())
     return;
 
   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_ == DateAction::NONE)
     return false;
   if (action_ == DateAction::SHOW_DATE_SETTINGS)
-    WmShell::Get()->system_tray_controller()->ShowDateSettings();
+    Shell::Get()->system_tray_controller()->ShowDateSettings();
   else if (action_ == DateAction::SET_SYSTEM_TIME)
-    WmShell::Get()->system_tray_controller()->ShowSetTimeDialog();
+    Shell::Get()->system_tray_controller()->ShowSetTimeDialog();
   else
     return false;
   CloseSystemBubble();
   return true;
 }
 
 void DateView::OnMouseEntered(const ui::MouseEvent& event) {
   if (action_ == DateAction::NONE)
     return;
   SetActive(true);
@@ skipping 19 matching lines @@
 
 TimeView::TimeView(ClockLayout clock_layout) : BaseDateTimeView(nullptr) {
   SetupLabels();
   UpdateTextInternal(base::Time::Now());
   UpdateClockLayout(clock_layout);
 }
 
 TimeView::~TimeView() {}
 
 void TimeView::UpdateTimeFormat() {
-  hour_type_ = WmShell::Get()->system_tray_controller()->hour_clock_type();
+  hour_type_ = Shell::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 103 matching lines @@
 }
 
 void TimeView::SetupLabel(views::Label* label) {
   label->set_owned_by_client();
   SetupLabelForTray(label);
   label->SetElideBehavior(gfx::NO_ELIDE);
 }
 
 }  // namespace tray
 }  // namespace ash