Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2531)

Unified Diff: ash/wm/solo_window_tracker_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/panels/panel_window_resizer.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/solo_window_tracker_unittest.cc
diff --git a/ash/wm/solo_window_tracker_unittest.cc b/ash/wm/solo_window_tracker_unittest.cc
index d134c4089ab6d129d6ae0a96553458c7d8c0ea21..25a8d2140861786a432ca86bad487831d0bcf83b 100644
--- a/ash/wm/solo_window_tracker_unittest.cc
+++ b/ash/wm/solo_window_tracker_unittest.cc
@@ -103,7 +103,7 @@ class SoloWindowTrackerTest : public test::AshTestBase {
// Because the tests use windows without delegates,
// aura::test::EventGenerator cannot be used.
gfx::Point drag_to =
- ash::ScreenAsh::GetDisplayBoundsInParent(window).top_right();
+ ash::ScreenUtil::GetDisplayBoundsInParent(window).top_right();
scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
window,
window->bounds().origin(),
@@ -118,7 +118,7 @@ class SoloWindowTrackerTest : public test::AshTestBase {
// Drag |window| out of the dock.
void UndockWindow(aura::Window* window) {
gfx::Point drag_to =
- ash::ScreenAsh::GetDisplayWorkAreaBoundsInParent(window).top_right() -
+ ash::ScreenUtil::GetDisplayWorkAreaBoundsInParent(window).top_right() -
gfx::Vector2d(10, 0);
scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
window,
@@ -138,7 +138,7 @@ class SoloWindowTrackerTest : public test::AshTestBase {
// Returns the secondary display.
gfx::Display GetSecondaryDisplay() {
- return ScreenAsh::GetSecondaryDisplay();
+ return ScreenUtil::GetSecondaryDisplay();
}
// Returns the window which uses the solo header, if any, on the primary
@@ -329,7 +329,7 @@ TEST_F(SoloWindowTrackerTest, MultiDisplay) {
// Moves the second window to the secondary display. Both w1/w2 should be
// solo.
w2->SetBoundsInScreen(gfx::Rect(1200, 0, 100, 100),
- ScreenAsh::GetSecondaryDisplay());
+ ScreenUtil::GetSecondaryDisplay());
EXPECT_EQ(w1.get(), GetWindowWithSoloHeaderInPrimary());
EXPECT_EQ(w2.get(), GetWindowWithSoloHeader(w2->GetRootWindow()));
EXPECT_TRUE(checker1.IsPaintScheduledAndReset());
« no previous file with comments | « ash/wm/panels/panel_window_resizer.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698