Move more from WmShell to Shell

ash/common/system/user/user_card_view.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/user/user_card_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/login_status.h"
 #include "ash/common/media_controller.h"
 #include "ash/common/session/session_controller.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_popup_item_style.h"
 #include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/user_manager/user_info.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/compositing_recorder.h"
@@ skipping 87 matching lines @@
 
   // Retrieve the user's display name and wrap it with markers.
   // Note that since this is a public account it always has to be the primary
   // user.
   base::string16 display_name = base::UTF8ToUTF16(
       WmShell::Get()->session_controller()->GetUserSession(0)->display_name);
   base::RemoveChars(display_name, kDisplayNameMark, &display_name);
   display_name = kDisplayNameMark[0] + display_name + kDisplayNameMark[0];
   // Retrieve the domain managing the device and wrap it with markers.
   base::string16 domain = base::UTF8ToUTF16(
-      WmShell::Get()->system_tray_delegate()->GetEnterpriseDomain());
+      Shell::Get()->system_tray_delegate()->GetEnterpriseDomain());
   base::RemoveChars(domain, kDisplayNameMark, &domain);
   base::i18n::WrapStringWithLTRFormatting(&domain);
   // Retrieve the label text, inserting the display name and domain.
   text_ = l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_PUBLIC_LABEL,
                                      display_name, domain);
 
   learn_more_ = new views::Link(l10n_util::GetStringUTF16(IDS_ASH_LEARN_MORE));
   learn_more_->SetUnderline(false);
   learn_more_->set_listener(this);
   AddChildView(learn_more_);
@@ skipping 83 matching lines @@
 
 void PublicAccountUserDetails::GetAccessibleNodeData(
     ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_STATIC_TEXT;
   node_data->SetName(text_);
 }
 
 void PublicAccountUserDetails::LinkClicked(views::Link* source,
                                            int event_flags) {
   DCHECK_EQ(source, learn_more_);
-  WmShell::Get()->system_tray_controller()->ShowPublicAccountInfo();
+  Shell::Get()->system_tray_controller()->ShowPublicAccountInfo();
 }
 
 void PublicAccountUserDetails::CalculatePreferredSize() {
   const gfx::FontList font_list;
   const gfx::Size link_size = learn_more_->GetPreferredSize();
   const int space_width =
       gfx::GetStringWidth(base::ASCIIToUTF16(" "), font_list);
   const gfx::Insets insets = GetInsets();
   int min_width = link_size.width();
   int max_width =
@@ skipping 165 matching lines @@
 
   TrayPopupItemStyle user_email_style(TrayPopupItemStyle::FontStyle::CAPTION);
   // Only the active user's email label is lightened (for the inactive user, the
   // label starts as black and the entire row is 54% opacity).
   if (is_active_user())
     user_email_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
   auto* user_email = new views::Label();
   base::string16 user_email_string;
   if (login_status != LoginStatus::GUEST) {
     user_email_string =
-        WmShell::Get()->system_tray_delegate()->IsUserSupervised()
+        Shell::Get()->system_tray_delegate()->IsUserSupervised()
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
             : base::UTF8ToUTF16(
                   controller->GetUserSession(user_index_)->display_email);
   }
   user_email->SetText(user_email_string);
   user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   user_email_style.SetupLabel(user_email);
   user_email->SetVisible(!user_email_string.empty());
   user_email->set_collapse_when_hidden(true);
 
@@ skipping 32 matching lines @@
 
     media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
     AddChildView(media_capture_icon_);
 
     WmShell::Get()->media_controller()->RequestCaptureState();
   }
 }
 
 }  // namespace tray
 }  // namespace ash