ash/system/supervised/tray_supervised_user.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/supervised/tray_supervised_user.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:

Index: ash/system/supervised/tray_supervised_user.cc

diff --git a/ash/system/supervised/tray_supervised_user.cc b/ash/system/supervised/tray_supervised_user.cc

index 7aac7f1923d1de84585844abbfd81f6fa5337b32..cd6b0a7e8208b65ad435621aff82e797eb9749e8 100644

--- a/ash/system/supervised/tray_supervised_user.cc

+++ b/ash/system/supervised/tray_supervised_user.cc

@@ -6,12 +6,12 @@

#include <utility>

-#include "ash/login_status.h"

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

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

#include "ash/resources/grit/ash_resources.h"

#include "ash/system/system_notifier.h"

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

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

-#include "ash/wm_shell.h"

#include "base/callback.h"

#include "base/logging.h"

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