NativeWidgetViews: Implement widget activation/deactivation.

views/widget/widget_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/native_widget_views.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 568 matching lines @@
 
   virtual void OnWidgetClosing(Widget* widget) OVERRIDE {
     if (active_ == widget)
       active_ = NULL;
     widget_closed_ = widget;
   }
 
   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 there's no 'desktop'/'window
manager' here, so this needs to pretend to be one.

       widget_activated_ = widget;
       active_ = widget;
-    } else
+    } else {
+      if (widget_activated_ == widget)
+        widget_activated_ = NULL;
       widget_deactivated_ = widget;
+    }
   }
 
   virtual void OnWidgetVisibilityChanged(Widget* widget,
                                          bool visible) OVERRIDE {
     if (visible)
       widget_shown_ = widget;
     else
       widget_hidden_ = widget;
   }
 
@@ skipping 23 matching lines @@
 
   Widget* active_;
 
   Widget* widget_closed_;
   Widget* widget_activated_;
   Widget* widget_deactivated_;
   Widget* widget_shown_;
   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());
 
   Widget* child1 = NewWidget();
   Widget* child2 = NewWidget();
 
   reset();
 
   child1->Activate();
   EXPECT_EQ(child1, widget_activated());
@@ skipping 21 matching lines @@
 
   child1->Show();
   EXPECT_EQ(child1, widget_shown());
 
   child2->Show();
   EXPECT_EQ(child2, widget_shown());
 }
 
 }  // namespace
 }  // namespace views