ash/system/tray/system_tray.cc - Issue 2099793002: mash: Migrate some system user files to 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 2099793002: mash: Migrate some system user files to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: ash/system/tray/system_tray.cc

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

index 1bfe2b4a1bba116c647ef3b72d16eb7ea18c662a..65cc28abcde4064c90f56ddff3318e27d470394c 100644

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

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

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

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

#include "ash/common/ash_switches.h"

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

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

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

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

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

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

#include "ash/common/system/tray_accessibility.h"

#include "ash/common/system/update/tray_update.h"

+#include "ash/common/system/user/tray_user_separator.h"

#include "ash/common/wm_lookup.h"

#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

@@ -23,9 +25,7 @@

#include "ash/shell.h"

#include "ash/system/cast/tray_cast.h"

#include "ash/system/status_area_widget.h"

-#include "ash/system/user/login_status.h"

#include "ash/system/user/tray_user.h"

-#include "ash/system/user/tray_user_separator.h"

#include "ash/system/web_notification/web_notification_tray.h"

#include "base/logging.h"

#include "base/metrics/histogram.h"