| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <algorithm> | 5 #include <algorithm> |
| 6 #include <memory> | 6 #include <memory> |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1364 Init(init_params); | 1364 Init(init_params); |
| 1365 | 1365 |
| 1366 View* contents_view = new View; | 1366 View* contents_view = new View; |
| 1367 contents_view->SetFocusBehavior(View::FocusBehavior::ALWAYS); | 1367 contents_view->SetFocusBehavior(View::FocusBehavior::ALWAYS); |
| 1368 SetContentsView(contents_view); | 1368 SetContentsView(contents_view); |
| 1369 | 1369 |
| 1370 Show(); | 1370 Show(); |
| 1371 Activate(); | 1371 Activate(); |
| 1372 } | 1372 } |
| 1373 | 1373 |
| 1374 #if defined(OS_LINUX) | 1374 #if defined(OS_LINUX) || defined(OS_WIN) |
| 1375 // Flaky on Linux rel ng: https://crbug.com/596039. | 1375 // Flaky on Linux rel ng: https://crbug.com/596039. |
| 1376 #define MAYBE_DesktopNativeWidgetNoPaintAfterCloseTest DISABLED_DesktopNativeWid
getNoPaintAfterCloseTest | 1376 #define MAYBE_DesktopNativeWidgetNoPaintAfterCloseTest DISABLED_DesktopNativeWid
getNoPaintAfterCloseTest |
| 1377 #else | 1377 #else |
| 1378 #define MAYBE_DesktopNativeWidgetNoPaintAfterCloseTest DesktopNativeWidgetNoPain
tAfterCloseTest | 1378 #define MAYBE_DesktopNativeWidgetNoPaintAfterCloseTest DesktopNativeWidgetNoPain
tAfterCloseTest |
| 1379 #endif | 1379 #endif |
| 1380 | 1380 |
| 1381 TEST_F(WidgetTest, MAYBE_DesktopNativeWidgetNoPaintAfterCloseTest) { | 1381 TEST_F(WidgetTest, MAYBE_DesktopNativeWidgetNoPaintAfterCloseTest) { |
| 1382 DesktopAuraTestValidPaintWidget widget; | 1382 DesktopAuraTestValidPaintWidget widget; |
| 1383 widget.InitForTest(CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS)); | 1383 widget.InitForTest(CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS)); |
| 1384 RunPendingMessages(); | 1384 RunPendingMessages(); |
| (...skipping 2327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3712 EXPECT_FALSE(!!IsWindow(owned_hwnd)); | 3712 EXPECT_FALSE(!!IsWindow(owned_hwnd)); |
| 3713 EXPECT_TRUE(!!IsWindowEnabled(top_hwnd)); | 3713 EXPECT_TRUE(!!IsWindowEnabled(top_hwnd)); |
| 3714 | 3714 |
| 3715 top_level_widget.CloseNow(); | 3715 top_level_widget.CloseNow(); |
| 3716 } | 3716 } |
| 3717 | 3717 |
| 3718 #endif // defined(OS_WIN) | 3718 #endif // defined(OS_WIN) |
| 3719 | 3719 |
| 3720 } // namespace test | 3720 } // namespace test |
| 3721 } // namespace views | 3721 } // namespace views |
| OLD | NEW |