ash/system/user/tray_user.cc - Issue 1877543002: Revise the shelf alignment locking mechanism.

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/user/tray_user.cc

Issue 1877543002: Revise the shelf alignment locking mechanism. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move logic to a new ShelfLockingManager, owned by Shelf. 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:

Index: ash/system/user/tray_user.cc

diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc

index a92bad56b6c8fc6c0658100cef8f02c617aed1d1..8fe7af40d5cafdc542f6578c35559883ff92b077 100644

--- a/ash/system/user/tray_user.cc

+++ b/ash/system/user/tray_user.cc

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

#include "ash/root_window_controller.h"

#include "ash/session/session_state_delegate.h"

#include "ash/shelf/shelf_layout_manager.h"

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

#include "ash/shell_delegate.h"

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

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

@@ -191,7 +192,7 @@ void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {

// Inactive users won't have a layout.

if (!layout_view_)

return;

- if (alignment == SHELF_ALIGNMENT_BOTTOM) {

+ if (IsHorizontalAlignment(alignment)) {

if (avatar_) {

avatar_->SetBorder(views::Border::NullBorder());

avatar_->SetCornerRadii(