ash/shell/shell_delegate_impl.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/shell/shell_delegate_impl.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/shell/shell_delegate_impl.cc

diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc

index bac716c9bd14a58d1e792cdc230a690e44cc428c..ca527810e861cae66947fda77f1838687b3ef4d3 100644

--- a/ash/shell/shell_delegate_impl.cc

+++ b/ash/shell/shell_delegate_impl.cc

@@ -7,13 +7,13 @@

#include "ash/app_list/app_list_presenter_delegate_factory.h"

#include "ash/common/accessibility_delegate.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/shell_window_ids.h"

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

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

#include "ash/default_user_wallpaper_delegate.h"

#include "ash/gpu_support_stub.h"

-#include "ash/media_delegate.h"

#include "ash/new_window_delegate.h"

#include "ash/pointer_watcher_delegate_aura.h"

#include "ash/shell.h"

« no previous file with comments | « ash/shell.cc ('k') | ash/system/chromeos/media_security/multi_profile_media_tray_item.cc » ('j') | no next file with comments »