ash/system/chromeos/screen_security/screen_tray_item.cc - Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/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/chromeos/screen_security/screen_tray_item.cc

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window

Patch Set: merge 2 trunk Created 4 years, 8 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

« ash/shelf/shelf.cc ('K') | « ash/system/chromeos/screen_security/screen_tray_item.h ('k') | ash/system/chromeos/session/logout_button_tray.h » ('j') | ash/system/status_area_widget_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8d5be35f0636257c357fb5ee2bce395d7f9221a3..c1efaf136722cc87061b26fa696e151e2924ae32 100644

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

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

@@ -183,7 +183,8 @@ void ScreenTrayItem::DestroyDefaultView() {

default_view_ = NULL;

}

-void ScreenTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {

+void ScreenTrayItem::UpdateAfterShelfAlignmentChange(

+ wm::ShelfAlignment alignment) {

if (!tray_view_)

return;