mash: Migrate remaining tray observers and notify functions.

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/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
-#include "ash/system/tray/system_tray_notifier.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"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/ash_view_ids.h"
+#include "ash/common/system/chromeos/media_security/media_capture_observer.h"
 #include "ash/media_delegate.h"
-#include "ash/system/tray/media_security/media_capture_observer.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/fill_layout.h"
 #endif
 
 namespace ash {
 namespace tray {
 
 namespace {
 
 const int kUserDetailsVerticalPadding = 5;
@@ skipping 10 matching lines @@
     SetLayoutManager(new views::FillLayout);
     views::ImageView* icon = new views::ImageView;
     icon->SetImage(ui::ResourceBundle::GetSharedInstance()
                        .GetImageNamed(IDR_AURA_UBER_TRAY_RECORDING_RED)
                        .ToImageSkia());
     AddChildView(icon);
     label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     label_->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
         ui::ResourceBundle::SmallFont));
     OnMediaCaptureChanged();
-    Shell::GetInstance()->system_tray_notifier()->AddMediaCaptureObserver(this);
+    WmShell::Get()->system_tray_notifier()->AddMediaCaptureObserver(this);
     set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
   }
 
   ~MediaIndicator() override {
-    Shell::GetInstance()->system_tray_notifier()->RemoveMediaCaptureObserver(
-        this);
+    WmShell::Get()->system_tray_notifier()->RemoveMediaCaptureObserver(this);
   }
 
   // MediaCaptureObserver:
   void OnMediaCaptureChanged() override {
     MediaCaptureState state =
         Shell::GetInstance()->media_delegate()->GetMediaCaptureState(index_);
     int res_id = 0;
     switch (state) {
       case MEDIA_CAPTURE_AUDIO_VIDEO:
         res_id = IDS_ASH_STATUS_TRAY_MEDIA_RECORDING_AUDIO_VIDEO;
@@ skipping 63 matching lines @@
       kTrayPopupPaddingHorizontal - kTrayPopupPaddingBetweenItems;
   const bool rtl = base::i18n::IsRTL();
   SetBorder(views::Border::CreateEmptyBorder(kUserDetailsVerticalPadding,
                                              rtl ? 0 : inner_padding,
                                              kUserDetailsVerticalPadding,
                                              rtl ? inner_padding : 0));
 
   // 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 = Shell::GetInstance()
-                                    ->session_state_delegate()
+  base::string16 display_name = WmShell::Get()
+                                    ->GetSessionStateDelegate()
                                     ->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(
       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.
@@ skipping 183 matching lines @@
   AddChildView(icon);
   int details_max_width = max_width - icon->GetPreferredSize().width() -
                           kTrayPopupPaddingBetweenItems;
   AddChildView(new PublicAccountUserDetails(details_max_width));
 }
 
 void UserCardView::AddUserContent(LoginStatus login_status, int user_index) {
   views::View* icon = CreateIcon(login_status, user_index);
   AddChildView(icon);
   views::Label* user_name = NULL;
-  SessionStateDelegate* delegate =
-      Shell::GetInstance()->session_state_delegate();
+  SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
   if (!user_index) {
     base::string16 user_name_string =
         login_status == LoginStatus::GUEST
             ? 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);
     }
   }
@@ skipping 61 matching lines @@
 views::View* UserCardView::CreateIcon(LoginStatus login_status,
                                       int user_index) {
   RoundedImageView* icon =
       new RoundedImageView(kTrayAvatarCornerRadius, user_index == 0);
   if (login_status == LoginStatus::GUEST) {
     icon->SetImage(*ui::ResourceBundle::GetSharedInstance()
                         .GetImageNamed(IDR_AURA_UBER_TRAY_GUEST_ICON)
                         .ToImageSkia(),
                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
   } else {
-    SessionStateDelegate* delegate =
-        Shell::GetInstance()->session_state_delegate();
+    SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
     icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(),
                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
   }
   return icon;
 }
 
 }  // namespace tray
 }  // namespace ash