summaryrefslogtreecommitdiffstats
path: root/ash/screen_ash_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 19:17:04 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 19:17:04 +0000
commite2f64d101a1e624bf300f598fea6c336db64f4a2 (patch)
tree9cd0c6a963f1152e2a1ec0667df1242a38fb627b /ash/screen_ash_unittest.cc
parent7f1a51c32f9c8c5a44118483c1255328d7983fce (diff)
downloadchromium_src-e2f64d101a1e624bf300f598fea6c336db64f4a2.zip
chromium_src-e2f64d101a1e624bf300f598fea6c336db64f4a2.tar.gz
chromium_src-e2f64d101a1e624bf300f598fea6c336db64f4a2.tar.bz2
Rename bounds accessors to be intuitive and consistent
GetClientAreaScreenBounds -> GetClientAreaBoundsInScreen Get/Set ParentBounds -> Get/Set BoundsInParent GetWorkAreaScreenBounds -> GetWorkAreaBoundsInScreen GetClientAreaScreenBounds -> GetClientAreaBoundsInScreen GetWindowScreenBounds -> GetWindowBoundsInScreen GetScreenBounds -> GetBoundsInScreen GetRootWindowBounds -> GetBoundsInRootWindow BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10795013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/screen_ash_unittest.cc')
-rw-r--r--ash/screen_ash_unittest.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc
index 96727c8..5197e38 100644
--- a/ash/screen_ash_unittest.cc
+++ b/ash/screen_ash_unittest.cc
@@ -50,34 +50,34 @@ TEST_F(ScreenAshTest, Bounds) {
// Maximized bounds
EXPECT_EQ("0,0 600x598",
- ScreenAsh::GetMaximizedWindowParentBounds(
+ ScreenAsh::GetMaximizedWindowBoundsInParent(
primary->GetNativeView()).ToString());
EXPECT_EQ("0,0 500x500",
- ScreenAsh::GetMaximizedWindowParentBounds(
+ ScreenAsh::GetMaximizedWindowBoundsInParent(
secondary->GetNativeView()).ToString());
// Unmaximized work area bounds
EXPECT_EQ("0,0 600x552",
- ScreenAsh::GetUnmaximizedWorkAreaParentBounds(
+ ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
primary->GetNativeView()).ToString());
EXPECT_EQ("0,0 500x500",
- ScreenAsh::GetUnmaximizedWorkAreaParentBounds(
+ ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
secondary->GetNativeView()).ToString());
// Display bounds
EXPECT_EQ("0,0 600x600",
- ScreenAsh::GetDisplayParentBounds(
+ ScreenAsh::GetDisplayBoundsInParent(
primary->GetNativeView()).ToString());
EXPECT_EQ("0,0 500x500",
- ScreenAsh::GetDisplayParentBounds(
+ ScreenAsh::GetDisplayBoundsInParent(
secondary->GetNativeView()).ToString());
// Work area bounds
EXPECT_EQ("0,0 600x552",
- ScreenAsh::GetDisplayWorkAreaParentBounds(
+ ScreenAsh::GetDisplayWorkAreaBoundsInParent(
primary->GetNativeView()).ToString());
EXPECT_EQ("0,0 500x500",
- ScreenAsh::GetDisplayWorkAreaParentBounds(
+ ScreenAsh::GetDisplayWorkAreaBoundsInParent(
secondary->GetNativeView()).ToString());
}
#endif