ash/system/screen_security/screen_tray_item.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (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/screen_security/screen_tray_item.cc

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

index f0f8d4f8917414b9ea171bc2024bfeb5c29cd2c5..d6b415c5ad478fd9ac2428ae7b8891a72455b721 100644

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

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

@@ -4,10 +4,10 @@

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

-#include "ash/common/material_design/material_design_controller.h"

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

+#include "ash/material_design/material_design_controller.h"

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

#include "ash/resources/vector_icons/vector_icons.h"

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

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

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

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