Merge 144625 - Close any open menus on activation changes.

ui/views/controls/menu/menu_controller.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #include <list>
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "ui/base/events.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 
 #if defined(USE_AURA)
+#include "ui/aura/client/activation_change_observer.h"
+
 namespace aura {
 class RootWindow;
+class Window;
 }
 #endif
 
 namespace ui {
 class OSExchangeData;
 }
 namespace views {
 
 class DropTargetEvent;
 class MenuButton;
 class MenuHostRootView;
 class MouseEvent;
 class SubmenuView;
 class View;
 
 namespace internal {
 class MenuControllerDelegate;
 class MenuRunnerImpl;
 }
 
 // MenuController -------------------------------------------------------------
 
 // MenuController is used internally by the various menu classes to manage
 // showing, selecting and drag/drop for menus. All relevant events are
 // forwarded to the MenuController from SubmenuView and MenuHost.
-class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher {
+class VIEWS_EXPORT MenuController
+#if defined(USE_AURA)
+    : public MessageLoop::Dispatcher,
+      public aura::client::ActivationChangeObserver {
+#else
+    : public MessageLoop::Dispatcher {
+#endif
+
  public:
   // Enumeration of how the menu should exit.
   enum ExitType {
     // Don't exit.
     EXIT_NONE,
 
     // All menus, including nested, should be exited.
     EXIT_ALL,
 
     // Only the outermost menu should be exited.
@@ skipping 57 matching lines @@
   bool CanDrop(SubmenuView* source, const ui::OSExchangeData& data);
   void OnDragEntered(SubmenuView* source, const DropTargetEvent& event);
   int OnDragUpdated(SubmenuView* source, const DropTargetEvent& event);
   void OnDragExited(SubmenuView* source);
   int OnPerformDrop(SubmenuView* source, const DropTargetEvent& event);
 
   // Invoked from the scroll buttons of the MenuScrollViewContainer.
   void OnDragEnteredScrollButton(SubmenuView* source, bool is_up);
   void OnDragExitedScrollButton(SubmenuView* source);
 
-  // Invoked once for any Widget activation change.  This allows the menu
-  // to be canceled if the window manager changes the active window.
-  void OnWidgetActivationChanged();
-
   // Update the submenu's selection based on the current mouse location
   void UpdateSubmenuSelection(SubmenuView* source);
 
  private:
   friend class internal::MenuRunnerImpl;
   friend class MenuHostRootView;
   friend class MenuItemView;
   friend class SubmenuView;
 
   class MenuScrollTask;
@@ skipping 295 matching lines @@
   // sets it to null.
   void SendMouseCaptureLostToActiveView();
 
   // Sets exit type.
   void SetExitType(ExitType type);
 
   // Handles the mouse location event on the submenu |source|.
   void HandleMouseLocation(SubmenuView* source,
                            const gfx::Point& mouse_location);
 
+#if defined(USE_AURA)
+  // aura::client::ActivationChangeObserver overrides:
+  virtual void OnWindowActivated(aura::Window* active,
+                                 aura::Window* old_active) OVERRIDE;
+#endif
+
   // The active instance.
   static MenuController* active_instance_;
 
   // If true, Run blocks. If false, Run doesn't block and this is used for
   // drag and drop. Note that the semantics for drag and drop are slightly
   // different: cancel timer is kicked off any time the drag moves outside the
   // menu, mouse events do nothing...
   bool blocking_run_;
 
   // If true, we're showing.
@@ skipping 87 matching lines @@
   // How deep we are in nested message loops. This should be at most 2 (when
   // showing a context menu from a menu).
   int message_loop_depth_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_