ash/system/web_notification/web_notification_tray.cc - Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash

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

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

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

Download patch

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

Index: ash/system/web_notification/web_notification_tray.cc

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

index a7fc6c844e25e9010ecb70eeb2c41bf878d91511..69694638968580654343609f12976f0f9358abd0 100644

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

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

@@ -28,7 +28,7 @@

#include "ui/aura/window.h"

#include "ui/aura/window_event_dispatcher.h"

#include "ui/base/l10n/l10n_util.h"

-#include "ui/gfx/screen.h"

+#include "ui/display/screen.h"

#include "ui/message_center/message_center_style.h"

#include "ui/message_center/message_center_tray_delegate.h"

#include "ui/message_center/views/message_bubble_base.h"

@@ -192,10 +192,11 @@ WebNotificationTray::WebNotificationTray(StatusAreaWidget* status_area_widget)

message_center(),

message_center_tray_.get(),

popup_alignment_delegate_.get()));

- const gfx::Display& display =

- gfx::Screen::GetScreen()->GetDisplayNearestWindow(

+ const display::Display& display =

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

status_area_widget->GetNativeView());

- popup_alignment_delegate_->StartObserving(gfx::Screen::GetScreen(), display);

+ popup_alignment_delegate_->StartObserving(display::Screen::GetScreen(),

+ display);

OnMessageCenterTrayChanged();

}