Close any open menus on activation changes.

ash/wm/activation_controller.cc

 // Copyright (c) 2012 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 "ash/wm/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
+#include "ui/views/controls/menu/menu_controller.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
 // These are the list of container ids of containers which may contain windows
 // that need to be activated in the order that they should be activated.
 const int kWindowContainerIds[] = {
     kShellWindowId_LockSystemModalContainer,
     kShellWindowId_SettingBubbleContainer,
@@ skipping 245 matching lines @@
   FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
                     observers_,
                     OnWindowActivated(window, old_active));
 
   // Invoke OnLostActive after we've changed the active window. That way if the
   // delegate queries for active state it doesn't think the window is still
   // active.
   if (old_active && aura::client::GetActivationDelegate(old_active))
     aura::client::GetActivationDelegate(old_active)->OnLostActive();
 
+  // Close any open menus (crbug.com/131027).
+  views::MenuController* menu_controller =
+      views::MenuController::GetActiveInstance();

[sky, 2012/06/25 23:34:38]

I don't like this dependency here. I would rather see MenuController get aura
specific code to deal with this. That could be an ActivationChangeObserver
implementation.

[flackr, 2012/06/26 13:17:16]

Sounds good to me. Done.

+  if (menu_controller)
+    menu_controller->OnWidgetActivationChanged();
+
   if (window) {
     StackTransientParentsBelowModalWindow(window);
     window->parent()->StackChildAtTop(window);
     if (aura::client::GetActivationDelegate(window))
       aura::client::GetActivationDelegate(window)->OnActivated();
   }
 }
 
 aura::Window* ActivationController::ActivateNextWindow(aura::Window* window) {
   aura::Window* next_window = NULL;
@@ skipping 46 matching lines @@
     if (*i != ignore &&
         CanActivateWindowWithEvent(*i, NULL, CURRENT_VISIBILITY) &&
         !wm::IsWindowMinimized(*i))
       return *i;
   }
   return NULL;
 }
 
 }  // namespace internal
 }  // namespace ash