Don't activate POPUP window

views/desktop/desktop_window_manager.cc

Index: views/desktop/desktop_window_manager.cc
diff --git a/views/desktop/desktop_window_manager.cc b/views/desktop/desktop_window_manager.cc
index 7276ecc1d47d2bf752c1ff229646ded706b87e55..2efc7c15c864d243765a35e198771996a7c8456a 100644
--- a/views/desktop/desktop_window_manager.cc
+++ b/views/desktop/desktop_window_manager.cc
@@ -10,6 +10,7 @@
 #include "ui/gfx/rect.h"
 #include "views/widget/widget.h"
 #include "views/widget/native_widget_private.h"
+#include "views/widget/native_widget_view.h"
 #include "views/widget/native_widget_views.h"
 #include "views/widget/widget_delegate.h"
 #if defined(OS_LINUX)
@@ -92,7 +93,8 @@ WindowController::~WindowController() {
 
 DesktopWindowManager::DesktopWindowManager(Widget* desktop)
     : desktop_(desktop),
-      mouse_capture_(NULL) {
+      mouse_capture_(NULL),
+      active_widget_(NULL) {
 }
 
 DesktopWindowManager::~DesktopWindowManager() {
@@ -154,8 +156,29 @@ bool DesktopWindowManager::HasMouseCapture(const views::Widget* widget) const {
   return widget && mouse_capture_ == widget;
 }
 
+bool DesktopWindowManager::HandleKeyEvent(
+    views::Widget* widget, const views::KeyEvent& event) {
+  return active_widget_ ?
+      static_cast<NativeWidgetViews*>(active_widget_->native_widget_private())
+          ->OnKeyEvent(event) : false;

[sadrul, 2011/08/26 16:21:36]

Could this just be 'active_widget_->OnKeyEvent(event)'?

[oshima, 2011/08/26 17:20:28]

We need to send to NativeViewViews as it needs to send key to InputMethod object
of the widget. It'd require some refactoring if we want to send it directly to
widget.

[sadrul, 2011/08/26 18:41:05]

Ah. That seems a little unfortunate. Thanks for the explanation.

+}
+
 bool DesktopWindowManager::HandleMouseEvent(
     views::Widget* widget, const views::MouseEvent& event) {
+  if (event.type() == ui::ET_MOUSE_PRESSED) {
+    View* target =
+        widget->GetRootView()->GetEventHandlerForPoint(event.location());
+
+    if (target->GetClassName() == internal::NativeWidgetView::kViewClassName) {
+      internal::NativeWidgetView* native_widget_view =
+          static_cast<internal::NativeWidgetView*>(target);
+      views::Widget* target_widget = native_widget_view->GetAssociatedWidget();
+      if (target_widget->CanActivate())
+        Activate(target_widget);
+    }
+  } else if (event.type() == ui::ET_MOUSEWHEEL && active_widget_) {
+    return active_widget_->OnMouseEvent(event);
+  }
 
   if (window_controller_.get()) {
     if (!window_controller_->OnMouseEvent(event)) {
@@ -174,9 +197,33 @@ bool DesktopWindowManager::HandleMouseEvent(
   return false;
 }
 
+void DesktopWindowManager::Register(Widget* widget) {

[sadrul, 2011/08/26 16:21:36]

Perhaps DCHECK(!widget->HasObserver(this))?

[oshima, 2011/08/26 17:20:28]

Done.

+  widget->AddObserver(this);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowManager, private:
 
+void DesktopWindowManager::OnWidgetClosing(Widget* widget) {
+  if (active_widget_ && active_widget_ == widget)
+    active_widget_ = NULL;
+}
+
+void DesktopWindowManager::OnWidgetVisibilityChanged(Widget* widget,
+                                                     bool visible) {
+}
+
+void DesktopWindowManager::OnWidgetActivationChanged(Widget* widget,
+                                                     bool active) {
+  if (active) {
+    if (active_widget_)
+      active_widget_->Deactivate();
+    active_widget_ = widget;
+  } else if (widget == active_widget_) {
+    active_widget_ = NULL;
+  }
+}
+
 void DesktopWindowManager::SetMouseCapture() {
   return desktop_->native_widget_private()->SetMouseCapture();
 }
@@ -189,5 +236,16 @@ bool DesktopWindowManager::HasMouseCapture() const {
   return desktop_->native_widget_private()->HasMouseCapture();
 }
 
+void DesktopWindowManager::Activate(Widget* widget) {
+  if (widget && widget->IsActive())
+    return;
+
+  if (widget) {
+    if (!widget->HasObserver(this))
+      widget->AddObserver(this);

[sadrul, 2011/08/26 16:21:36]

Perhaps just 'DCHECK(widget->HasObserver(this));' here? this will make sure all
windows are registered to the WM.

+    widget->Activate();
+  }
+}
+
 }  // namespace desktop
 }  // namespace views