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

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

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: Created 3 years, 9 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
Index: ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
index f331b12cc1fe56d38d813a44767fc43b50fac0fc..09f8bdd021433366582bf3a6e9f18f0115371863 100644
--- a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
+++ b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
@@ -12,6 +12,7 @@
#include "ash/common/system/tray/tray_item_view.h"
#include "ash/common/wm_shell.h"
#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/views/controls/image_view.h"
@@ -26,14 +27,14 @@ class MultiProfileMediaTrayView : public TrayItemView,
CreateImageView();
image_view()->SetImage(
gfx::CreateVectorIcon(kSystemTrayRecordingIcon, kTrayIconColor));
- WmShell::Get()->media_controller()->AddObserver(this);
+ Shell::Get()->media_controller()->AddObserver(this);
SetVisible(false);
- WmShell::Get()->media_controller()->RequestCaptureState();
+ Shell::Get()->media_controller()->RequestCaptureState();
set_id(VIEW_ID_MEDIA_TRAY_VIEW);
}
~MultiProfileMediaTrayView() override {
- WmShell::Get()->media_controller()->RemoveObserver(this);
+ Shell::Get()->media_controller()->RemoveObserver(this);
}
// MediaCaptureObserver:

Powered by Google App Engine
This is Rietveld 408576698