ash/system/audio/volume_view.cc - Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray

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/volume_view.cc

Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayupdatemove

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/system/audio/volume_view.cc

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

index 521eb7060e9d2bab89af5e61e1da43813f4a94b8..b83600b2a408d0cc2b280e2a9f9750c620f20c53 100644

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

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

@@ -7,10 +7,10 @@

#include "ash/common/ash_constants.h"

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

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

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

#include "ash/shell.h"

#include "ash/system/audio/tray_audio.h"

#include "ash/system/audio/tray_audio_delegate.h"

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

#include "grit/ash_resources.h"

#include "grit/ash_strings.h"

#include "ui/base/resource/resource_bundle.h"

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