summaryrefslogtreecommitdiffstats
path: root/ui/aura/window_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 16:40:06 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 16:40:06 +0000
commit8d625fbd16a1d20f5e34bd01b83b0402bd3b4c80 (patch)
tree4fd429027e6fe44e79e8395ae63d6542d7edf657 /ui/aura/window_unittest.cc
parent87cc09add3a1a9ef94aaec1865fc3aaa23720aaa (diff)
downloadchromium_src-8d625fbd16a1d20f5e34bd01b83b0402bd3b4c80.zip
chromium_src-8d625fbd16a1d20f5e34bd01b83b0402bd3b4c80.tar.gz
chromium_src-8d625fbd16a1d20f5e34bd01b83b0402bd3b4c80.tar.bz2
* Use Virtual Screen Coordinates in more places
- When setting widget bounds. - Workspace Manager - When resizing - Restore bounds * Refactored ScreenPositionClient to manage Screen coordinates for different configurations. * Renamed GetBounds/SetBounds methods to GetScreen/ParentBounds to make it clear that in which coordinates you're dealing with. * I used InScreen/InParent for RestoreBounds because RestoreParent/ScreenBounds sounds strange. Converted Linux/Aura to use ScreenPositionClient. BUG=123160 TEST=several tests are updated to match VSC. added screen_ash_unittests. I'll update rest of tests when this is enable by default. Review URL: https://chromiumcodereview.appspot.com/10696023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window_unittest.cc')
-rw-r--r--ui/aura/window_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index d955719..54a2458 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -934,22 +934,22 @@ TEST_F(WindowTest, ReleaseCaptureOnDestroy) {
EXPECT_EQ(NULL, aura::client::GetCaptureWindow(root_window()));
}
-TEST_F(WindowTest, GetBoundsInRootWindow) {
+TEST_F(WindowTest, GetRootWindowBounds) {
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->GetBoundsInRootWindow().ToString());
+ EXPECT_EQ("0,0 100x100", child->GetRootWindowBounds().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->GetBoundsInRootWindow().ToString());
+ EXPECT_EQ("-100,-100 100x100", child->GetRootWindowBounds().ToString());
// The |child| window is moved to the 0,0 in screen coordinates.
- // |GetBoundsInRootWindow()| should return 0,0.
+ // |GetRootWindowBounds()| should return 0,0.
child->SetBounds(gfx::Rect(100, 100, 100, 100));
- EXPECT_EQ("0,0 100x100", child->GetBoundsInRootWindow().ToString());
+ EXPECT_EQ("0,0 100x100", child->GetRootWindowBounds().ToString());
}
class MouseEnterExitWindowDelegate : public TestWindowDelegate {