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

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

Issue 2615663002: Fix MediaClient::RequestCaptureState(). (Closed)
Patch Set: ash Created 3 years, 11 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 | « no previous file | ash/common/system/user/tray_user.cc » ('j') | ash/common/system/user/tray_user.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9c0bdf6d84c4e62f50e52582b2eb626b8cfcd9ed..5864e2f5c1a30e6288a1181a701f8673eb1f68bb 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
@@ -6,7 +6,7 @@
#include "ash/common/ash_view_ids.h"
#include "ash/common/media_controller.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray/tray_item_view.h"
@@ -44,11 +44,10 @@ class MultiProfileMediaTrayView : public TrayItemView,
// MediaCaptureObserver:
void OnMediaCaptureChanged(
const std::vector<mojom::MediaCaptureState>& capture_states) override {
- SessionStateDelegate* 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) {
+ index < WmShell::Get()->session_controller()->NumberOfLoggedInUsers();
James Cook 2017/01/09 21:07:19 xiyuan, this works, but is the long-term plan that
xiyuan 2017/01/09 21:21:47 yes, ash code should use SessionController. The br
+ ++index) {
if (capture_states[index] != mojom::MediaCaptureState::NONE) {
SetVisible(true);
return;
« no previous file with comments | « no previous file | ash/common/system/user/tray_user.cc » ('j') | ash/common/system/user/tray_user.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698