Merge 144625 - Close any open menus on activation changes.

ui/views/controls/menu/menu_controller.cc

Index: ui/views/controls/menu/menu_controller.cc
===================================================================
--- ui/views/controls/menu/menu_controller.cc	(revision 146181)
+++ ui/views/controls/menu/menu_controller.cc	(working copy)
@@ -26,10 +26,12 @@
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
+#include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/dispatcher_client.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/window.h"
 #endif
 
 using base::Time;
@@ -325,8 +327,17 @@
   DCHECK_LE(message_loop_depth_, 2);
 #if defined(USE_AURA)
   root_window_ = parent->GetNativeWindow()->GetRootWindow();
+
+  // Observe activation changes to close the window if another window is
+  // activated (crbug.com/131027).
+  if (!nested_menu)
+    aura::client::GetActivationClient(root_window_)->AddObserver(this);
+
   aura::client::GetDispatcherClient(root_window_)->
       RunWithDispatcher(this, parent->GetNativeWindow(), true);
+
+  if (!nested_menu)
+    aura::client::GetActivationClient(root_window_)->RemoveObserver(this);
 #else
   {
     MessageLoopForUI* loop = MessageLoopForUI::current();
@@ -698,11 +709,6 @@
   StopScrolling();
 }
 
-void MenuController::OnWidgetActivationChanged() {
-  if (!drag_in_progress_)
-    Cancel(EXIT_ALL);
-}
-
 void MenuController::UpdateSubmenuSelection(SubmenuView* submenu) {
   if (submenu->IsShowing()) {
     gfx::Point point = gfx::Screen::GetCursorScreenPoint();
@@ -2122,4 +2128,12 @@
   }
 }
 
+#if defined(USE_AURA)
+void MenuController::OnWindowActivated(aura::Window* active,
+                                       aura::Window* old_active) {
+  if (!drag_in_progress_)
+    Cancel(EXIT_ALL);
+}
+#endif
+
 }  // namespace views