| Index: ash/extended_desktop_unittest.cc
|
| diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
|
| index 1d13390fc6f33d5afc51959e40f9df1b4d1e2fac..8f5642e57c1dead4bfbbe4bd2256565c48a6179b 100644
|
| --- a/ash/extended_desktop_unittest.cc
|
| +++ b/ash/extended_desktop_unittest.cc
|
| @@ -800,14 +800,13 @@ TEST_F(ExtendedDesktopTest, StayInSameRootWindow) {
|
| w1->SetBounds(gfx::Rect(150, 10, 50, 50));
|
| EXPECT_EQ(root_windows[1], w1->GetNativeView()->GetRootWindow());
|
|
|
| - // The widget stays in the same root if kStayInSameRootWindowKey is set to
|
| - // true.
|
| - w1->GetNativeView()->SetProperty(kStayInSameRootWindowKey, true);
|
| + // The widget stays in the same root if kLockedToRootKey is set to true.
|
| + w1->GetNativeView()->SetProperty(kLockedToRootKey, true);
|
| w1->SetBounds(gfx::Rect(10, 10, 50, 50));
|
| EXPECT_EQ(root_windows[1], w1->GetNativeView()->GetRootWindow());
|
|
|
| // The widget should now move to the 1st root window without the property.
|
| - w1->GetNativeView()->ClearProperty(kStayInSameRootWindowKey);
|
| + w1->GetNativeView()->ClearProperty(kLockedToRootKey);
|
| w1->SetBounds(gfx::Rect(10, 10, 50, 50));
|
| EXPECT_EQ(root_windows[0], w1->GetNativeView()->GetRootWindow());
|
|
|
|
|