| Index: ui/aura/window_unittest.cc
|
| diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
|
| index 6795eff38b24e89b4a9cfabaeec7e45f9fda0a87..a3401f646849a3d3498ed6bebdc23ad881e99b50 100644
|
| --- a/ui/aura/window_unittest.cc
|
| +++ b/ui/aura/window_unittest.cc
|
| @@ -761,22 +761,22 @@ TEST_F(WindowTest, ReleaseCaptureOnDestroy) {
|
| EXPECT_EQ(NULL, root_window()->capture_window());
|
| }
|
|
|
| -TEST_F(WindowTest, GetScreenBounds) {
|
| +TEST_F(WindowTest, GetBoundsInRootWindow) {
|
| scoped_ptr<Window> viewport(CreateTestWindowWithBounds(
|
| gfx::Rect(0, 0, 300, 300), NULL));
|
| scoped_ptr<Window> child(CreateTestWindowWithBounds(
|
| gfx::Rect(0, 0, 100, 100), viewport.get()));
|
| // Sanity check.
|
| - EXPECT_EQ("0,0 100x100", child->GetScreenBounds().ToString());
|
| + EXPECT_EQ("0,0 100x100", child->GetBoundsInRootWindow().ToString());
|
|
|
| // The |child| window's screen bounds should move along with the |viewport|.
|
| viewport->SetBounds(gfx::Rect(-100, -100, 300, 300));
|
| - EXPECT_EQ("-100,-100 100x100", child->GetScreenBounds().ToString());
|
| + EXPECT_EQ("-100,-100 100x100", child->GetBoundsInRootWindow().ToString());
|
|
|
| // The |child| window is moved to the 0,0 in screen coordinates.
|
| - // |GetScreenBounds()| should return 0,0.
|
| + // |GetBoundsInRootWindow()| should return 0,0.
|
| child->SetBounds(gfx::Rect(100, 100, 100, 100));
|
| - EXPECT_EQ("0,0 100x100", child->GetScreenBounds().ToString());
|
| + EXPECT_EQ("0,0 100x100", child->GetBoundsInRootWindow().ToString());
|
| }
|
|
|
| class MouseEnterExitWindowDelegate : public TestWindowDelegate {
|
|
|