chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget 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: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase Created 4 years, 5 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 | « chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc ('k') | chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

index c8966e81dc73a36fa75f3e7e24e494c4c5a7b7f7..660f3cb8d63c8f81f3356cc7fb41dc953bf870ae 100644

--- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

@@ -4,10 +4,10 @@

#include <vector>

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

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

#include "ash/common/wm_shell.h"

#include "ash/shell.h"

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

#include "ash/test/tray_cast_test_api.h"

#include "base/macros.h"

#include "chrome/browser/media/router/media_routes_observer.h"