ash/system/tray/system_tray.cc - Issue 2113113002: mash: Move chromeos audio system tray files 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/tray/system_tray.cc

Issue 2113113002: mash: Move chromeos audio system tray files 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/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index 38c5a939372d1b59278021e97eaf4a978fd5d125..9b5f6928eb63e94e83c2940bd51ce66932ee89d9 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

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

#include "ui/views/view.h"

#if defined(OS_CHROMEOS)

+#include "ash/common/system/chromeos/audio/tray_audio_chromeos.h"

#include "ash/common/system/chromeos/network/tray_network.h"

#include "ash/common/system/chromeos/network/tray_sms.h"

#include "ash/common/system/chromeos/network/tray_vpn.h"

@@ -55,7 +56,6 @@

#include "ash/common/system/chromeos/settings/tray_settings.h"

#include "ash/common/system/chromeos/tray_tracing.h"

#include "ash/common/system/ime/tray_ime_chromeos.h"

-#include "ash/system/chromeos/audio/tray_audio_chromeos.h"

#include "ash/system/chromeos/bluetooth/tray_bluetooth.h"

#include "ash/system/chromeos/brightness/tray_brightness.h"

#include "ash/system/chromeos/enterprise/tray_enterprise.h"

« no previous file with comments | « ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc ('k') | no next file » | no next file with comments »