diff options
| author | jonross@chromium.org <jonross@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 19:05:39 +0000 |
|---|---|---|
| committer | jonross@chromium.org <jonross@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 19:05:39 +0000 |
| commit | e6de855727a0722ab1e140bf94386eabd464d78c (patch) | |
| tree | 2326aaf541ff7676191edf3d545a21b0a0f5d644 /ash/extended_desktop_unittest.cc | |
| parent | 7dadd85f18da013a5b41b5455d1ac16ac85cea1b (diff) | |
| download | chromium_src-e6de855727a0722ab1e140bf94386eabd464d78c.zip chromium_src-e6de855727a0722ab1e140bf94386eabd464d78c.tar.gz chromium_src-e6de855727a0722ab1e140bf94386eabd464d78c.tar.bz2 | |
Re-Reland Linux Window Control Alignment
Modifying CustomFrameView to layout window controls based on user configurations. For linux begin observing the configs and changes. For other systems fall back on a default ordering.
This reland addresses changes to custom_frame_view_unittest.cc that landed before the original patch. Causing a build failure.
Original code review: https://codereview.chromium.org/281353009/
Revert code review: https://codereview.chromium.org/294473016
Revert "Revert 272352 "Reland Linux Window Control Alignment""
This reverts commit b6f34fbeb011683117b33639ca78d66ff32d5bfd.
TBR=oshima, sadrul
TEST=CustomFrameViewTest
BUG=351917
Review URL: https://codereview.chromium.org/296283003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/extended_desktop_unittest.cc')
| -rw-r--r-- | ash/extended_desktop_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index 4ad8301..eb8591d 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc @@ -518,7 +518,7 @@ TEST_F(ExtendedDesktopTest, MoveWindowWithTransient) { w1, gfx::Rect(50, 50, 50, 50), false /* transient */); // Transient child of the transient child. views::Widget* w1_t11 = CreateTestWidgetWithParent( - w1_t1, gfx::Rect(1200, 70, 30, 30), false /* transient */); + w1_t1, gfx::Rect(1200, 70, 35, 35), false /* transient */); views::Widget* w11 = CreateTestWidgetWithParent( w1, gfx::Rect(10, 10, 40, 40), true /* child */); @@ -532,7 +532,7 @@ TEST_F(ExtendedDesktopTest, MoveWindowWithTransient) { EXPECT_EQ(root_windows[0], w11_t1->GetNativeView()->GetRootWindow()); EXPECT_EQ("50,50 50x50", w1_t1->GetWindowBoundsInScreen().ToString()); - EXPECT_EQ("1200,70 30x30", + EXPECT_EQ("1200,70 35x35", w1_t11->GetWindowBoundsInScreen().ToString()); EXPECT_EQ("20,20 40x40", w11->GetWindowBoundsInScreen().ToString()); @@ -552,7 +552,7 @@ TEST_F(ExtendedDesktopTest, MoveWindowWithTransient) { // Transient window's screen bounds stays the same. EXPECT_EQ("50,50 50x50", w1_t1->GetWindowBoundsInScreen().ToString()); - EXPECT_EQ("1200,70 30x30", + EXPECT_EQ("1200,70 35x35", w1_t11->GetWindowBoundsInScreen().ToString()); EXPECT_EQ("1300,100 80x80", w11_t1->GetWindowBoundsInScreen().ToString()); |