ash/sysui/shell_delegate_mus.cc - Issue 2113023002: mash: Migrate MediaDelegate ownership and access to WmShell.

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: ash/sysui/shell_delegate_mus.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

Index: ash/sysui/shell_delegate_mus.cc

diff --git a/ash/sysui/shell_delegate_mus.cc b/ash/sysui/shell_delegate_mus.cc

index ffb310188ab02d205f2ff487909afcf221f1d8ce..8cf896b36b88cd181c747df799be8de66cf0b238 100644

--- a/ash/sysui/shell_delegate_mus.cc

+++ b/ash/sysui/shell_delegate_mus.cc

@@ -5,10 +5,10 @@

#include "ash/sysui/shell_delegate_mus.h"

#include "ash/common/default_accessibility_delegate.h"

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

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

#include "ash/common/system/tray/default_system_tray_delegate.h"

#include "ash/gpu_support_stub.h"

-#include "ash/media_delegate.h"

#include "ash/sysui/app_list_presenter_mus.h"

#include "ash/sysui/context_menu_mus.h"

#include "ash/sysui/pointer_watcher_delegate_mus.h"

« no previous file with comments | « ash/system/user/user_card_view.cc ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »