ash/system/chromeos/screen_security/screen_tray_item.cc - Issue 2093283002: mash: Convert all of //ash/system to use WmShelf

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/chromeos/screen_security/screen_tray_item.cc

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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/chromeos/screen_security/screen_tray_item.cc

diff --git a/ash/system/chromeos/screen_security/screen_tray_item.cc b/ash/system/chromeos/screen_security/screen_tray_item.cc

index 0da3dba82210aa1d5d61b78a150cbc3f7d2e3fe1..506ff8a3453c8a436cc4ddebe05401ff7049b706 100644

--- a/ash/system/chromeos/screen_security/screen_tray_item.cc

+++ b/ash/system/chromeos/screen_security/screen_tray_item.cc

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

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

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

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

-#include "ash/shelf/shelf_util.h"

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

#include "ui/message_center/message_center.h"

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