ash/wm/panels/panel_layout_manager_unittest.cc - Issue 138003007: [Cleanup] Screen cleanup

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/wm/panels/panel_layout_manager_unittest.cc

Issue 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make sure screen_for_shutdown is reset everytime Created 6 years, 11 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/wm/panels/panel_layout_manager_unittest.cc

diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc

index e573f0c1f5b1c3e7a8c9aa03a3a2533809ceaa94..9608ba47c478b40bd0ce3d488512101f835d8918 100644

--- a/ash/wm/panels/panel_layout_manager_unittest.cc

+++ b/ash/wm/panels/panel_layout_manager_unittest.cc

@@ -6,7 +6,7 @@

#include "ash/ash_switches.h"

#include "ash/root_window_controller.h"

-#include "ash/screen_ash.h"

+#include "ash/screen_util.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_button.h"

#include "ash/shelf/shelf_layout_manager.h"

@@ -95,7 +95,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {

void PanelInScreen(aura::Window* panel) {

gfx::Rect panel_bounds = panel->GetBoundsInRootWindow();

gfx::Point root_point = gfx::Point(panel_bounds.x(), panel_bounds.y());

- gfx::Display display = ScreenAsh::FindDisplayContainingPoint(root_point);

+ gfx::Display display = ScreenUtil::FindDisplayContainingPoint(root_point);

gfx::Rect panel_bounds_in_screen = panel->GetBoundsInScreen();

gfx::Point screen_bottom_right = gfx::Point(

« no previous file with comments | « ash/wm/panels/panel_layout_manager.cc ('k') | ash/wm/panels/panel_window_resizer.cc » ('j') | no next file with comments »