ash/system/media_security/multi_profile_media_tray_item_unittest.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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/media_security/multi_profile_media_tray_item_unittest.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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

« no previous file with comments | « ash/system/media_security/multi_profile_media_tray_item.cc ('k') | ash/system/network/network_state_list_detailed_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/media_security/multi_profile_media_tray_item_unittest.cc

diff --git a/ash/system/media_security/multi_profile_media_tray_item_unittest.cc b/ash/system/media_security/multi_profile_media_tray_item_unittest.cc

index 71d30010d4361759bb15510cf8a20f409532a630..e6417cbbf1952a3c988cdb0baa7da8c1141c5edc 100644

--- a/ash/system/media_security/multi_profile_media_tray_item_unittest.cc

+++ b/ash/system/media_security/multi_profile_media_tray_item_unittest.cc

@@ -4,8 +4,9 @@

#include "ash/system/media_security/multi_profile_media_tray_item.h"

-#include "ash/ash_view_ids.h"

-#include "ash/media_controller.h"

+#include "ash/common/ash_view_ids.h"

+#include "ash/common/media_controller.h"

+#include "ash/common/wm_shell.h"

#include "ash/public/interfaces/media.mojom.h"

#include "ash/system/status_area_widget.h"

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

@@ -16,7 +17,6 @@

#include "ash/test/status_area_widget_test_helper.h"

#include "ash/test/test_session_state_delegate.h"

#include "ash/test/test_shell_delegate.h"

-#include "ash/wm_shell.h"

#include "ui/views/bubble/tray_bubble_view.h"

namespace ash {