mash: Migrate MediaDelegate ownership and access 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/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 "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/media_delegate.h"
 #include "ash/common/system/chromeos/media_security/media_capture_observer.h"
-#include "ash/media_delegate.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 21 matching lines @@
     set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
   }
 
   ~MediaIndicator() override {
     WmShell::Get()->system_tray_notifier()->RemoveMediaCaptureObserver(this);
   }
 
   // MediaCaptureObserver:
   void OnMediaCaptureChanged() override {
     MediaCaptureState state =
-        Shell::GetInstance()->media_delegate()->GetMediaCaptureState(index_);
+        WmShell::Get()->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;
         break;
       case MEDIA_CAPTURE_AUDIO:
         res_id = IDS_ASH_STATUS_TRAY_MEDIA_RECORDING_AUDIO;
         break;
       case MEDIA_CAPTURE_VIDEO:
         res_id = IDS_ASH_STATUS_TRAY_MEDIA_RECORDING_VIDEO;
@@ skipping 344 matching lines @@
   } else {
     SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
     icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(),
                    gfx::Size(kTrayItemSize, kTrayItemSize));
   }
   return icon;
 }
 
 }  // namespace tray
 }  // namespace ash