ash/system/audio/tray_audio.cc - Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/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/system/audio/tray_audio.cc

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/system/audio/tray_audio.cc

diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc

index 3fab14001be8c0aed1cf3a8241430d381fa1ebbe..a14f4cc97db2fe336590f9a3fc8ac029840887e2 100644

--- a/ash/system/audio/tray_audio.cc

+++ b/ash/system/audio/tray_audio.cc

@@ -8,6 +8,8 @@

#include <utility>

#include "ash/ash_constants.h"

+#include "ash/common/system/tray/system_tray_delegate.h"

+#include "ash/common/system/volume_control_delegate.h"

#include "ash/display/display_manager.h"

#include "ash/metrics/user_metrics_recorder.h"

#include "ash/shell.h"

@@ -17,10 +19,8 @@

#include "ash/system/tray/fixed_sized_scroll_view.h"

#include "ash/system/tray/hover_highlight_view.h"

#include "ash/system/tray/system_tray.h"

-#include "ash/system/tray/system_tray_delegate.h"

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

#include "ash/system/tray/tray_constants.h"

-#include "ash/volume_control_delegate.h"

#include "base/strings/utf_string_conversions.h"

#include "grit/ash_resources.h"

#include "third_party/skia/include/core/SkCanvas.h"

« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/system/cast/tray_cast.cc » ('j') | no next file with comments »