| Index: ui/views/widget/native_widget_win_unittest.cc
|
| ===================================================================
|
| --- ui/views/widget/native_widget_win_unittest.cc (revision 153679)
|
| +++ ui/views/widget/native_widget_win_unittest.cc (working copy)
|
| @@ -50,28 +50,28 @@
|
|
|
| TEST_F(NativeWidgetWinTest, ZoomWindow) {
|
| scoped_ptr<NativeWidgetWin> window(CreateNativeWidgetWin());
|
| - window->ShowWindow(SW_HIDE);
|
| + ShowWindow(window->GetNativeView(), SW_HIDE);
|
| EXPECT_FALSE(window->IsActive());
|
| - window->ShowWindow(SW_MAXIMIZE);
|
| - EXPECT_TRUE(window->IsZoomed());
|
| + ShowWindow(window->GetNativeView(), SW_MAXIMIZE);
|
| + EXPECT_TRUE(IsZoomed(window->GetNativeView()));
|
| window->CloseNow();
|
| }
|
|
|
| TEST_F(NativeWidgetWinTest, SetBoundsForZoomedWindow) {
|
| scoped_ptr<NativeWidgetWin> window(CreateNativeWidgetWin());
|
| - window->ShowWindow(SW_MAXIMIZE);
|
| - EXPECT_TRUE(window->IsZoomed());
|
| + ShowWindow(window->GetNativeView(), SW_MAXIMIZE);
|
| + EXPECT_TRUE(IsZoomed(window->GetNativeView()));
|
|
|
| // Create another window, so that it will be active.
|
| scoped_ptr<NativeWidgetWin> window2(CreateNativeWidgetWin());
|
| - window2->ShowWindow(SW_MAXIMIZE);
|
| + ShowWindow(window2->GetNativeView(), SW_MAXIMIZE);
|
| EXPECT_TRUE(window2->IsActive());
|
| EXPECT_FALSE(window->IsActive());
|
|
|
| // Verify that setting the bounds of a zoomed window will unzoom it and not
|
| // cause it to be activated.
|
| window->SetBounds(gfx::Rect(50, 50, 650, 650));
|
| - EXPECT_FALSE(window->IsZoomed());
|
| + EXPECT_FALSE(IsZoomed(window->GetNativeView()));
|
| EXPECT_FALSE(window->IsActive());
|
|
|
| // Cleanup.
|
|
|