Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Unified Diff: views/widget/widget_unittest.cc

Issue 7585028: NativeWidgetViews: Implement widget activation/deactivation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/widget/native_widget_views.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « views/widget/native_widget_views.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698