| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/views/widget/native_widget_mac.h" | 5 #include "ui/views/widget/native_widget_mac.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "ui/views/test/widget_test.h" | 9 #include "ui/views/test/widget_test.h" |
| 10 #include "ui/views/test/test_widget_observer.h" | 10 #include "ui/views/test/test_widget_observer.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 private: | 36 private: |
| 37 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMacInteractiveUITest); | 37 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMacInteractiveUITest); |
| 38 }; | 38 }; |
| 39 | 39 |
| 40 class NativeWidgetMacInteractiveUITest::Observer : public TestWidgetObserver { | 40 class NativeWidgetMacInteractiveUITest::Observer : public TestWidgetObserver { |
| 41 public: | 41 public: |
| 42 Observer(NativeWidgetMacInteractiveUITest* parent, Widget* widget) | 42 Observer(NativeWidgetMacInteractiveUITest* parent, Widget* widget) |
| 43 : TestWidgetObserver(widget), parent_(parent) {} | 43 : TestWidgetObserver(widget), parent_(parent) {} |
| 44 | 44 |
| 45 virtual void OnWidgetActivationChanged(Widget* widget, bool active) override { | 45 void OnWidgetActivationChanged(Widget* widget, bool active) override { |
| 46 if (active) | 46 if (active) |
| 47 parent_->activationCount_++; | 47 parent_->activationCount_++; |
| 48 else | 48 else |
| 49 parent_->deactivationCount_++; | 49 parent_->deactivationCount_++; |
| 50 } | 50 } |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 NativeWidgetMacInteractiveUITest* parent_; | 53 NativeWidgetMacInteractiveUITest* parent_; |
| 54 | 54 |
| 55 DISALLOW_COPY_AND_ASSIGN(Observer); | 55 DISALLOW_COPY_AND_ASSIGN(Observer); |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 widget2->CloseNow(); | 128 widget2->CloseNow(); |
| 129 widget->CloseNow(); | 129 widget->CloseNow(); |
| 130 } | 130 } |
| 131 | 131 |
| 132 INSTANTIATE_TEST_CASE_P(NativeWidgetMacInteractiveUITestInstance, | 132 INSTANTIATE_TEST_CASE_P(NativeWidgetMacInteractiveUITestInstance, |
| 133 NativeWidgetMacInteractiveUITest, | 133 NativeWidgetMacInteractiveUITest, |
| 134 ::testing::Bool()); | 134 ::testing::Bool()); |
| 135 | 135 |
| 136 } // namespace test | 136 } // namespace test |
| 137 } // namespace views | 137 } // namespace views |
| OLD | NEW |