chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc - Issue 2563643003: mash: Change the MediaDelegate to a Media{Controller,Client}.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

Issue 2563643003: mash: Change the MediaDelegate to a Media{Controller,Client}. (Closed)

Patch Set: Comment fixes Created 4 years 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 | « chrome/browser/ui/ash/media_delegate_chromeos.cc ('k') | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

index 48e2e5c1f70cfe76ded8f8c8fec6aebb87f81438..099b47f385b5813ed589840ebfc9eb2b7b82d25b 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

@@ -5,9 +5,9 @@

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"

#include "ash/aura/wm_window_aura.h"

+#include "ash/common/media_controller.h"

#include "ash/common/multi_profile_uma.h"

#include "ash/common/session/session_state_delegate.h"

-#include "ash/common/system/tray/system_tray_notifier.h"

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/common/wm/window_state.h"

#include "ash/common/wm_shell.h"

@@ -445,7 +445,7 @@ void MultiUserWindowManagerChromeOS::ActiveUserChanged(

this, account_id, GetAdjustedAnimationTimeInMS(kUserFadeTimeMS)));

// Call notifier here instead of observing ActiveUserChanged because

// this must happen after MultiUserWindowManagerChromeOS is notified.

- ash::WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged();

+ ash::WmShell::Get()->media_controller()->RequestCaptureState();

}

void MultiUserWindowManagerChromeOS::OnWindowDestroyed(aura::Window* window) {