NativeWidgetViews: Implement widget activation/deactivation.

views/desktop/desktop_window_view.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/desktop/desktop_window_view.h"
 
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/transform.h"
 #include "views/desktop/desktop_background.h"
 #include "views/desktop/desktop_window_root_view.h"
@@ skipping 120 matching lines @@
 #endif
   window->Init(params);
   window->Show();
   window->Maximize();
 }
 
 void DesktopWindowView::ActivateWidget(Widget* widget) {
   if (widget && widget->IsActive())
     return;
 
-  if (active_native_widget_)
-    active_native_widget_->OnActivate(false);
   if (widget) {
-    widget->MoveToTop();
-    active_native_widget_ =
-        static_cast<NativeWidgetViews*>(widget->native_widget());
-    active_native_widget_->OnActivate(true);
     if (!widget->HasObserver(this))
       widget->AddObserver(this);
+    widget->Activate();
   }
 }
 
 
 void DesktopWindowView::CreateTestWindow(const std::wstring& title,
                                          SkColor color,
                                          gfx::Rect initial_bounds,
                                          bool rotate) {
   views::Widget* window = views::Widget::CreateWindowWithBounds(
       new TestWindowContentView(title, color),
@@ skipping 85 matching lines @@
       (active_native_widget_)->GetWidget() == widget)
     active_native_widget_ = NULL;
 }
 
 void DesktopWindowView::OnWidgetVisibilityChanged(Widget* widget,
                                                   bool visible) {
 }
 
 void DesktopWindowView::OnWidgetActivationChanged(Widget* widget,
                                                   bool active) {
+  if (active) {
+    if (active_native_widget_)
+      active_native_widget_->GetWidget()->Deactivate();
+    active_native_widget_ =
+        static_cast<NativeWidgetViews*>(widget->native_widget());
+  } else if (widget == active_native_widget_->GetWidget()) {
+    active_native_widget_ = NULL;
+  }
 }
 
 }  // namespace desktop
 }  // namespace views