chrome/browser/ui/ash/multi_user/user_switch_util.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/multi_user/user_switch_util.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/chromeos/system/tray_accessibility_browsertest.cc ('k') | chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/user_switch_util.cc

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

index e527fb77aa233a1ca9196f570d326f3779fa1c6d..d21e82642d9b7a837828088d3dd225e497fdf654 100644

--- a/chrome/browser/ui/ash/multi_user/user_switch_util.cc

+++ b/chrome/browser/ui/ash/multi_user/user_switch_util.cc

@@ -5,9 +5,9 @@

#include "chrome/browser/ui/ash/multi_user/user_switch_util.h"

#include "ash/common/system/chromeos/screen_security/screen_tray_item.h"

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

#include "ash/shell.h"

#include "ash/strings/grit/ash_strings.h"

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

#include "ui/base/l10n/l10n_util.h"

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

#include "ui/views/controls/label.h"