Move more from WmShell to Shell

ash/common/system/chromeos/session/tray_session_length_limit.cc

 // Copyright 2014 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/chromeos/session/tray_session_length_limit.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/system/tray/label_tray_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/grit/ash_resources.h"
+#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/views/view.h"
 
@@ skipping 55 matching lines @@
   Update();
 }
 
 void TraySessionLengthLimit::Update() {
   UpdateState();
   UpdateNotification();
   UpdateTrayBubbleView();
 }
 
 void TraySessionLengthLimit::UpdateState() {
-  SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+  SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
   if (delegate->GetSessionStartTime(&session_start_time_) &&
       delegate->GetSessionLengthLimit(&time_limit_)) {
     const base::TimeDelta expiring_soon_threshold(
         base::TimeDelta::FromMinutes(kExpiringSoonThresholdInMinutes));
     remaining_session_time_ =
         std::max(time_limit_ - (base::TimeTicks::Now() - session_start_time_),
                  base::TimeDelta());
     limit_state_ = remaining_session_time_ <= expiring_soon_threshold
                        ? LIMIT_EXPIRING_SOON
                        : LIMIT_SET;
@@ skipping 83 matching lines @@
 
 base::string16 TraySessionLengthLimit::ComposeTrayBubbleMessage() const {
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_BUBBLE_SESSION_LENGTH_LIMIT,
       ui::TimeFormat::Detailed(ui::TimeFormat::FORMAT_DURATION,
                                ui::TimeFormat::LENGTH_LONG, 10,
                                remaining_session_time_));
 }
 
 }  // namespace ash