Turn Bookmark Menus Async

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_
 
 #include <stddef.h>
 
 #include <list>
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 
+#if defined(USE_AURA)
+namespace aura {
+namespace client {
+class ActivationChangeObserver;
+}  // namespace client
+}  // namespace aura
+#endif  // defined(USE_AURA)
+
 namespace ui {
 class OSExchangeData;
 class ScopedEventDispatcher;
 }
 namespace views {
 
 class MenuButton;
 class MenuHostRootView;
 class MenuItemView;
 class MenuMessageLoop;
@@ skipping 273 matching lines @@
   // Key processing.
   void OnKeyDown(ui::KeyboardCode key_code);
 
   // Creates a MenuController. If |blocking| is true a nested message loop is
   // started in |Run|.
   MenuController(bool blocking,
                  internal::MenuControllerDelegate* delegate);
 
   ~MenuController() override;
 
-  // Runs the platform specific bits of the message loop. If |nested_menu| is
-  // true we're being asked to run a menu from within a menu (eg a context
-  // menu).
-  void RunMessageLoop(bool nested_menu);
+  // Runs the platform specific bits of the message loop.
+  void RunMessageLoop();
 
   // Invokes AcceleratorPressed() on the hot tracked view if there is one.
   // Returns true if AcceleratorPressed() was invoked.
   bool SendAcceleratorToHotTrackedView();
 
   void UpdateInitialLocation(const gfx::Rect& bounds,
                              MenuAnchorPosition position,
                              bool context_menu);
 
   // Invoked when the user accepts the selected item. This is only used
@@ skipping 358 matching lines @@
   // pressed), subsequent events (like dragging) should also go to it, even if
   // the mouse is no longer over the view.
   MenuHostRootView* current_mouse_event_target_;
 
   // A mask of the EventFlags for the mouse buttons currently pressed.
   int current_mouse_pressed_state_;
 
   std::unique_ptr<MenuMessageLoop> message_loop_;
 
 #if defined(USE_AURA)
+  std::unique_ptr<aura::client::ActivationChangeObserver>
+      activation_change_observer_;
   std::unique_ptr<MenuKeyEventHandler> key_event_handler_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_