ash/system/web_notification/ash_popup_alignment_delegate.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/web_notification/ash_popup_alignment_delegate.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/web_notification/ash_popup_alignment_delegate.h

diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.h b/ash/system/web_notification/ash_popup_alignment_delegate.h

index 96e7c5f03ab7694a151992d90865c8587ccdcb65..45027ab878d132996a7cf381cbc31bdd0b31fdff 100644

--- a/ash/system/web_notification/ash_popup_alignment_delegate.h

+++ b/ash/system/web_notification/ash_popup_alignment_delegate.h

@@ -8,8 +8,8 @@

#include <stdint.h>

#include "ash/ash_export.h"

+#include "ash/common/shelf/shelf_types.h"

#include "ash/shelf/shelf_layout_manager_observer.h"

-#include "ash/shelf/shelf_types.h"

#include "ash/shell_observer.h"

#include "base/macros.h"

#include "ui/display/display_observer.h"

@@ -60,7 +60,7 @@ class ASH_EXPORT AshPopupAlignmentDelegate

friend class WebNotificationTrayTest;

// Get the current alignment of the shelf.

- wm::ShelfAlignment GetAlignment() const;

+ ShelfAlignment GetAlignment() const;

// Utility function to get the display which should be care about.

display::Display GetCurrentDisplay() const;