mash: Move SystemTrayDelegate ownership to WmShell

ash/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/system/user/user_card_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_utils.h"
 #include "ash/system/user/rounded_image_view.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_vector.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"
@@ skipping 139 matching lines @@
   // Note that since this is a public account it always has to be the primary
   // user.
   base::string16 display_name = Shell::GetInstance()
                                     ->session_state_delegate()
                                     ->GetUserInfo(0)
                                     ->GetDisplayName();
   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(
-      Shell::GetInstance()->system_tray_delegate()->GetEnterpriseDomain());
+      WmShell::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 84 matching lines @@
        it != lines_.end();
        ++it) {
     (*it)->Draw(canvas);
   }
   views::View::OnPaint(canvas);
 }
 
 void PublicAccountUserDetails::LinkClicked(views::Link* source,
                                            int event_flags) {
   DCHECK_EQ(source, learn_more_);
-  Shell::GetInstance()->system_tray_delegate()->ShowPublicAccountInfo();
+  WmShell::Get()->system_tray_delegate()->ShowPublicAccountInfo();
 }
 
 void PublicAccountUserDetails::CalculatePreferredSize(int max_allowed_width) {
   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 = std::min(
@@ skipping 86 matching lines @@
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL)
             : delegate->GetUserInfo(user_index)->GetDisplayName();
     if (!user_name_string.empty()) {
       user_name = new views::Label(user_name_string);
       user_name->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     }
   }
 
   views::Label* user_email = NULL;
   if (login_status != LoginStatus::GUEST) {
-    SystemTrayDelegate* tray_delegate =
-        Shell::GetInstance()->system_tray_delegate();
+    SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
     base::string16 user_email_string =
         tray_delegate->IsUserSupervised()
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
             : base::UTF8ToUTF16(delegate->GetUserInfo(user_index)->GetEmail());
     if (!user_email_string.empty()) {
       user_email = new views::Label(user_email_string);
       user_email->SetFontList(
           ui::ResourceBundle::GetSharedInstance().GetFontList(
               ui::ResourceBundle::SmallFont));
       user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ skipping 57 matching lines @@
     SessionStateDelegate* delegate =
         Shell::GetInstance()->session_state_delegate();
     icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(),
                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
   }
   return icon;
 }
 
 }  // namespace tray
 }  // namespace ash