ash/common/system/user/tray_user.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: ash/common/system/user/tray_user.cc

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

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

« ash/common/system/tray/system_tray_unittest.cc ('K') | « ash/common/system/update/tray_update_unittest.cc ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/user/tray_user.cc

diff --git a/ash/common/system/user/tray_user.cc b/ash/common/system/user/tray_user.cc

index 463307698b310363c75518e2502f2af7ac992f28..93f7064dbe6ba7d216bbb47f1bce18ded0955243 100644

--- a/ash/common/system/user/tray_user.cc

+++ b/ash/common/system/user/tray_user.cc

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

#include "ash/common/ash_switches.h"

#include "ash/common/session/session_state_delegate.h"

#include "ash/common/shelf/wm_shelf_util.h"

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

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

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

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

@@ -15,7 +16,6 @@

#include "ash/common/system/user/rounded_image_view.h"

#include "ash/common/system/user/user_view.h"

#include "ash/common/wm_shell.h"

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

#include "base/logging.h"

#include "base/strings/string16.h"

#include "components/signin/core/account_id/account_id.h"