Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3429)

Unified Diff: ash/system/chromeos/media_security/multi_profile_media_tray_item.cc

Issue 2113023002: mash: Migrate MediaDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comment. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/system/user/user_card_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc b/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
index 8314895b0b2f1888449508b2f11e6c0f936fb0e8..02b7103ce57c02015a1b5f4a3c0358b0654cbfea 100644
--- a/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
+++ b/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
@@ -5,13 +5,12 @@
#include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"
#include "ash/ash_view_ids.h"
+#include "ash/common/media_delegate.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 "grit/ash_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/views/controls/image_view.h"
@@ -42,7 +41,7 @@ class MultiProfileMediaTrayView : public TrayItemView,
// MediaCaptureObserver:
void OnMediaCaptureChanged() override {
- MediaDelegate* media_delegate = Shell::GetInstance()->media_delegate();
+ MediaDelegate* media_delegate = WmShell::Get()->media_delegate();
SessionStateDelegate* session_state_delegate =
WmShell::Get()->GetSessionStateDelegate();
// The user at 0 is the current desktop user.
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/system/user/user_card_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698