ash/system/web_notification/ash_popup_alignment_delegate.cc - Issue 2033833002: ash: Remove aura dependencies from ash/system/web_notification

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 2033833002: ash: Remove aura dependencies from ash/system/web_notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/system/web_notification/ash_popup_alignment_delegate.h ('k') | ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc » ('j') | ash/system/web_notification/web_notification_tray.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 4f31f1f610211895e6b5162668e51464f528575a..99fd8161458770fc75dabf861f7611841da124f7 100644

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

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

@@ -4,15 +4,15 @@

#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/display/window_tree_host_manager.h"

-#include "ash/screen_util.h"

#include "ash/shelf/shelf_constants.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_types.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

#include "base/i18n/rtl.h"

-#include "ui/aura/window.h"

#include "ui/display/display.h"

#include "ui/display/screen.h"

#include "ui/gfx/geometry/rect.h"

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

}

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

- return display::Screen::GetScreen()->GetDisplayNearestWindow(

- shelf_->shelf_widget()->GetNativeView());

+ return wm::WmLookup::Get()

+ ->GetWindowForWidget(shelf_->shelf_widget())

+ ->GetDisplayNearestWindow();

}

void AshPopupAlignmentDelegate::UpdateWorkArea() {