ash/system/chromeos/screen_security/screen_tray_item.h - Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf

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.h

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gyp 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.h

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

index 83d808010863ecd8d5a33234f7c77e86e8d47080..6e48357a55dd7525a7e6cd2c2e6ac201a635b0b0 100644

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

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

@@ -123,7 +123,7 @@ class ASH_EXPORT ScreenTrayItem : public SystemTrayItem {

views::View* CreateDefaultView(user::LoginStatus status) override = 0;

void DestroyTrayView() override;

void DestroyDefaultView() override;

- void UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) override;

+ void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;

private:

tray::ScreenTrayView* tray_view_;