mash: Migrate remaining tray observers and notify functions.

ash/system/chromeos/media_security/multi_profile_media_tray_item.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/tray/media_security/multi_profile_media_tray_item.h"
+#include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"
 
 #include "ash/ash_view_ids.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/chromeos/media_security/media_capture_observer.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_item_view.h"
+#include "ash/common/wm_shell.h"
 #include "ash/media_delegate.h"
 #include "ash/shell.h"
-#include "ash/system/tray/media_security/media_capture_observer.h"
-#include "ash/system/tray/system_tray_notifier.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 namespace tray {
 
 class MultiProfileMediaTrayView : public TrayItemView,
                                   public MediaCaptureObserver {
  public:
   explicit MultiProfileMediaTrayView(SystemTrayItem* system_tray_item)
       : TrayItemView(system_tray_item) {
     SetLayoutManager(new views::FillLayout);
     views::ImageView* icon = new views::ImageView;
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     icon->SetImage(
         bundle.GetImageNamed(IDR_AURA_UBER_TRAY_RECORDING).ToImageSkia());
     AddChildView(icon);
     OnMediaCaptureChanged();
-    Shell::GetInstance()->system_tray_notifier()->AddMediaCaptureObserver(this);
+    WmShell::Get()->system_tray_notifier()->AddMediaCaptureObserver(this);
     set_id(VIEW_ID_MEDIA_TRAY_VIEW);
   }
 
   ~MultiProfileMediaTrayView() override {
-    Shell::GetInstance()->system_tray_notifier()->RemoveMediaCaptureObserver(
-        this);
+    WmShell::Get()->system_tray_notifier()->RemoveMediaCaptureObserver(this);
   }
 
   // MediaCaptureObserver:
   void OnMediaCaptureChanged() override {
     MediaDelegate* media_delegate = Shell::GetInstance()->media_delegate();
     SessionStateDelegate* session_state_delegate =
-        Shell::GetInstance()->session_state_delegate();
+        WmShell::Get()->GetSessionStateDelegate();
     // The user at 0 is the current desktop user.
     for (UserIndex index = 1;
          index < session_state_delegate->NumberOfLoggedInUsers(); ++index) {
       if (media_delegate->GetMediaCaptureState(index) != MEDIA_CAPTURE_NONE) {
         SetVisible(true);
         return;
       }
     }
     SetVisible(false);
   }
@@ skipping 14 matching lines @@
 views::View* MultiProfileMediaTrayItem::CreateTrayView(LoginStatus status) {
   tray_view_ = new tray::MultiProfileMediaTrayView(this);
   return tray_view_;
 }
 
 void MultiProfileMediaTrayItem::DestroyTrayView() {
   tray_view_ = NULL;
 }
 
 }  // namespace ash