ash/system/web_notification/ash_popup_alignment_delegate.cc - Issue 2035543004: Shuffles and renames ash/common/wm classes

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

Issue 2035543004: Shuffles and renames ash/common/wm classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: random changes for chrome tests 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.cc

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

index 99fd8161458770fc75dabf861f7611841da124f7..e6a657671b2253038f9b8214725e376b58b0c854 100644

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

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

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

#include "ash/system/web_notification/ash_popup_alignment_delegate.h"

-#include "ash/common/wm/wm_lookup.h"

-#include "ash/common/wm/wm_window.h"

+#include "ash/common/wm_lookup.h"

+#include "ash/common/wm_window.h"

#include "ash/display/window_tree_host_manager.h"

#include "ash/shelf/shelf_constants.h"

#include "ash/shelf/shelf_layout_manager.h"

@@ -112,7 +112,7 @@ wm::ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {

}

display::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {

- return wm::WmLookup::Get()

+ return WmLookup::Get()

->GetWindowForWidget(shelf_->shelf_widget())

->GetDisplayNearestWindow();

}