diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 19:17:04 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 19:17:04 +0000 |
| commit | e2f64d101a1e624bf300f598fea6c336db64f4a2 (patch) | |
| tree | 9cd0c6a963f1152e2a1ec0667df1242a38fb627b /ash/shell_unittest.cc | |
| parent | 7f1a51c32f9c8c5a44118483c1255328d7983fce (diff) | |
| download | chromium_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/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 247a122..3bf6cf3 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -267,9 +267,9 @@ TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) { views::Widget* launcher_widget = shell->launcher()->widget(); EXPECT_TRUE(launcher_widget->IsVisible()); // Launcher is at bottom-left of screen. - EXPECT_EQ(0, launcher_widget->GetWindowScreenBounds().x()); + EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x()); EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHostSize().height(), - launcher_widget->GetWindowScreenBounds().bottom()); + launcher_widget->GetWindowBoundsInScreen().bottom()); // We have a desktop background but not a bare layer. EXPECT_TRUE(test_api.root_window_layout()->background_widget()); EXPECT_FALSE(test_api.root_window_layout()->background_layer()); |