Turn Bookmark Menus Async

ui/views/controls/menu/activation_change_observer_impl.h

Index: ui/views/controls/menu/activation_change_observer_impl.h
diff --git a/ui/views/controls/menu/activation_change_observer_impl.h b/ui/views/controls/menu/activation_change_observer_impl.h
new file mode 100644
index 0000000000000000000000000000000000000000..06938934915dd48f334d802803dee588d51ad46d
--- /dev/null
+++ b/ui/views/controls/menu/activation_change_observer_impl.h
@@ -0,0 +1,55 @@
+// Copyright 2016 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_ACTIVATION_CHANGE_OBSERVER_IMPL_H_
+#define UI_VIEWS_CONTROLS_MENU_ACTIVATION_CHANGE_OBSERVER_IMPL_H_
+
+#include "ui/aura/window_observer.h"
+#include "ui/events/event_handler.h"
+#include "ui/wm/public/activation_change_observer.h"
+
+namespace aura {
+class Window;
+}  // namespace aura
+
+namespace views {
+
+class MenuController;
+class Widget;
+
+// ActivationChangeObserverImpl is used to observe activation changes and close
+// the menu. Additionally it listens for the root window to be destroyed and
+// cancel the menu as well.
+class ActivationChangeObserverImpl

[sky, 2016/08/01 21:39:45]

This name makes sense as an inner class, but for a top-level class it's a bit
unclear. How about a more focused name, perhaps MenuActivationChangeObserver?

Can we also combine the MenuKeyEventHandler would this class? It seems silly to
have to separate EventHandlers. Note that the order they are installed is
slightly different, but I'm not sure that matters.

[jonross, 2016/08/02 15:03:25]

I've merged them.

The differences in how they were installed didn't matter. I've switched to the
format of MenuKeyEventHandler, as we only need to be installed once as a
pre-target handler.

For the merged class I went with MenuPreTargetHandler as a name. Doesn't quite
capture the activation change portion, but represents that it eats events. I'm
open to alternative names.

+    : public aura::client::ActivationChangeObserver,
+      public aura::WindowObserver,
+      public ui::EventHandler {
+ public:
+  ActivationChangeObserverImpl(MenuController* controller, Widget* owner);
+  ~ActivationChangeObserverImpl() override;
+
+  // aura::client:ActivationChangeObserver:
+  void OnWindowActivated(
+      aura::client::ActivationChangeObserver::ActivationReason reason,
+      aura::Window* gained_active,
+      aura::Window* lost_active) override;
+
+  // aura::WindowObserver:
+  void OnWindowDestroying(aura::Window* window) override;
+
+  // ui::EventHandler:
+  void OnCancelMode(ui::CancelModeEvent* event) override;
+
+ private:
+  void Cleanup();
+
+  MenuController* controller_;
+  aura::Window* root_;
+
+  DISALLOW_COPY_AND_ASSIGN(ActivationChangeObserverImpl);
+};
+
+}  // namespace views
+
+#endif  // UI_VIEWS_CONTROLS_MENU_ACTIVATION_CHANGE_OBSERVER_IMPL_H_