ash/system/web_notification/ash_popup_alignment_delegate_unittest.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/ash_popup_alignment_delegate_unittest.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.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

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

index bff868df96b077da26cea3c408da88d8959067c6..ef0d7af7c8953f2b6fd409c148787b1305b82009 100644

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

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

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

#include "ash/test/ash_test_base.h"

#include "base/command_line.h"

#include "base/memory/ptr_util.h"

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

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

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

#include "ui/keyboard/keyboard_switches.h"

#include "ui/keyboard/keyboard_util.h"

#include "ui/message_center/message_center_style.h"

@@ -64,8 +64,8 @@ class AshPopupAlignmentDelegateTest : public test::AshTestBase {

}

void UpdateWorkArea(AshPopupAlignmentDelegate* alignment_delegate,

- const gfx::Display& display) {

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

+ const display::Display& display) {

+ alignment_delegate->StartObserving(display::Screen::GetScreen(), display);

// Update the layout

alignment_delegate->OnDisplayWorkAreaInsetsChanged();

}

@@ -78,12 +78,12 @@ class AshPopupAlignmentDelegateTest : public test::AshTestBase {

}

alignment_delegate_ = std::move(delegate);

UpdateWorkArea(alignment_delegate_.get(),

- gfx::Screen::GetScreen()->GetPrimaryDisplay());

+ display::Screen::GetScreen()->GetPrimaryDisplay());

}

Position GetPositionInDisplay(const gfx::Point& point) {

const gfx::Rect& work_area =

- gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();

+ display::Screen::GetScreen()->GetPrimaryDisplay().work_area();

const gfx::Point center_point = work_area.CenterPoint();

if (work_area.x() > point.x() || work_area.y() > point.y() ||

work_area.right() < point.x() || work_area.bottom() < point.y()) {

@@ -274,7 +274,7 @@ TEST_F(AshPopupAlignmentDelegateTest, Extended) {

SetAlignmentDelegate(base::WrapUnique(new AshPopupAlignmentDelegate(

Shelf::ForPrimaryDisplay()->shelf_layout_manager())));

- gfx::Display second_display = ScreenUtil::GetSecondaryDisplay();

+ display::Display second_display = ScreenUtil::GetSecondaryDisplay();

aura::Window* second_root =

Shell::GetInstance()

->window_tree_host_manager()