ash/desktop_background/desktop_background_controller.cc - Issue 2084533008: mash: Migrate tray audio and deps to common.

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/desktop_background/desktop_background_controller.cc

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. 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:

Index: ash/desktop_background/desktop_background_controller.cc

diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc

index 228b5497fb9f6807fe8a50c20614974cc3e33b84..602d0e24b47c29434409ebf5b0dcaed5ca5c2229 100644

--- a/ash/desktop_background/desktop_background_controller.cc

+++ b/ash/desktop_background/desktop_background_controller.cc

@@ -6,6 +6,7 @@

#include "ash/aura/wm_window_aura.h"

#include "ash/common/ash_switches.h"

+#include "ash/common/display/display_info.h"

#include "ash/common/shell_window_ids.h"

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

#include "ash/common/wm_shell.h"

@@ -13,7 +14,6 @@

#include "ash/desktop_background/desktop_background_view.h"

#include "ash/desktop_background/desktop_background_widget_controller.h"

#include "ash/desktop_background/user_wallpaper_delegate.h"

-#include "ash/display/display_info.h"

#include "ash/display/display_manager.h"

#include "ash/root_window_controller.h"

#include "ash/shell.h"