Chromium Code Reviews| Index: views/widget/widget_unittest.cc |
| diff --git a/views/widget/widget_unittest.cc b/views/widget/widget_unittest.cc |
| index 04e766279b794cf3b30216f053f53df2a0874934..3833975245d8011e86747b55c1cca61f426751ee 100644 |
| --- a/views/widget/widget_unittest.cc |
| +++ b/views/widget/widget_unittest.cc |
| @@ -586,10 +586,15 @@ class WidgetObserverTest : public WidgetTest, |
| virtual void OnWidgetActivationChanged(Widget* widget, |
| bool active) OVERRIDE { |
| if (active) { |
| + if (widget_activated_) |
| + widget_activated_->Deactivate(); |
|
sadrul
2011/08/07 04:25:10
I would've liked to avoid doing this in here. But
|
| widget_activated_ = widget; |
| active_ = widget; |
| - } else |
| + } else { |
| + if (widget_activated_ == widget) |
| + widget_activated_ = NULL; |
| widget_deactivated_ = widget; |
| + } |
| } |
| virtual void OnWidgetVisibilityChanged(Widget* widget, |
| @@ -633,9 +638,7 @@ class WidgetObserverTest : public WidgetTest, |
| Widget* widget_hidden_; |
| }; |
| -// TODO: This test should be enabled when NativeWidgetViews::Activate is |
| -// implemented. |
| -TEST_F(WidgetObserverTest, DISABLED_ActivationChange) { |
| +TEST_F(WidgetObserverTest, ActivationChange) { |
| Widget* toplevel = CreateTopLevelPlatformWidget(); |
| views_delegate.set_default_parent_view(toplevel->GetRootView()); |