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 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
803 Widget* widget_closed_; | 803 Widget* widget_closed_; |
804 Widget* widget_activated_; | 804 Widget* widget_activated_; |
805 Widget* widget_deactivated_; | 805 Widget* widget_deactivated_; |
806 Widget* widget_shown_; | 806 Widget* widget_shown_; |
807 Widget* widget_hidden_; | 807 Widget* widget_hidden_; |
808 Widget* widget_bounds_changed_; | 808 Widget* widget_bounds_changed_; |
809 | 809 |
810 Widget* widget_to_close_on_hide_; | 810 Widget* widget_to_close_on_hide_; |
811 }; | 811 }; |
812 | 812 |
813 TEST_F(WidgetObserverTest, ActivationChange) { | 813 // This test appears to be flaky on Mac. |
| 814 #if defined(OS_MACOSX) |
| 815 #define MAYBE_ActivationChange DISABLED_ActivationChange |
| 816 #else |
| 817 #define MAYBE_ActivationChange ActivationChange |
| 818 #endif |
| 819 |
| 820 TEST_F(WidgetObserverTest, MAYBE_ActivationChange) { |
814 WidgetAutoclosePtr toplevel(CreateTopLevelPlatformWidget()); | 821 WidgetAutoclosePtr toplevel(CreateTopLevelPlatformWidget()); |
815 WidgetAutoclosePtr toplevel1(NewWidget()); | 822 WidgetAutoclosePtr toplevel1(NewWidget()); |
816 WidgetAutoclosePtr toplevel2(NewWidget()); | 823 WidgetAutoclosePtr toplevel2(NewWidget()); |
817 | 824 |
818 toplevel1->Show(); | 825 toplevel1->Show(); |
819 toplevel2->Show(); | 826 toplevel2->Show(); |
820 | 827 |
821 reset(); | 828 reset(); |
822 | 829 |
823 toplevel1->Activate(); | 830 toplevel1->Activate(); |
(...skipping 3111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3935 } | 3942 } |
3936 | 3943 |
3937 TEST_F(CompositingWidgetTest, Transparency_DesktopWidgetTranslucent) { | 3944 TEST_F(CompositingWidgetTest, Transparency_DesktopWidgetTranslucent) { |
3938 CheckAllWidgetsForOpacity(Widget::InitParams::TRANSLUCENT_WINDOW); | 3945 CheckAllWidgetsForOpacity(Widget::InitParams::TRANSLUCENT_WINDOW); |
3939 } | 3946 } |
3940 | 3947 |
3941 #endif // !defined(OS_CHROMEOS) | 3948 #endif // !defined(OS_CHROMEOS) |
3942 | 3949 |
3943 } // namespace test | 3950 } // namespace test |
3944 } // namespace views | 3951 } // namespace views |
OLD | NEW |