summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher_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/launcher/launcher_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/launcher/launcher_unittest.cc')
-rw-r--r--ash/launcher/launcher_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/launcher/launcher_unittest.cc b/ash/launcher/launcher_unittest.cc
index 2a0c1eb..15d237c 100644
--- a/ash/launcher/launcher_unittest.cc
+++ b/ash/launcher/launcher_unittest.cc
@@ -25,7 +25,8 @@ TEST_F(LauncherTest, SetStatusSize) {
Launcher* launcher = Shell::GetInstance()->launcher();
LauncherView* launcher_view = launcher->GetLauncherViewForTest();
- gfx::Size launcher_size = launcher->widget()->GetWindowScreenBounds().size();
+ gfx::Size launcher_size =
+ launcher->widget()->GetWindowBoundsInScreen().size();
int total_width = launcher_size.width();
ASSERT_GT(total_width, 0);
launcher->SetStatusSize(gfx::Size(total_width / 2, launcher_size.height()));