ash/system/chromeos/session/logout_button_tray.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/session/logout_button_tray.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: rebase again 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/session/logout_button_tray.h

diff --git a/ash/system/chromeos/session/logout_button_tray.h b/ash/system/chromeos/session/logout_button_tray.h

index 7c70bd1ace52f7e145525f1e54ff824ead501616..5294b250cf4abf0f6b69b9adf87adadb0cfc8509 100644

--- a/ash/system/chromeos/session/logout_button_tray.h

+++ b/ash/system/chromeos/session/logout_button_tray.h

@@ -31,7 +31,7 @@ class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView,

~LogoutButtonTray() override;

// TrayBackgroundView:

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

+ void SetShelfAlignment(ShelfAlignment alignment) override;

base::string16 GetAccessibleNameForTray() override;

void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;

void ClickedOutsideBubble() override;