Update ui/views menus to use async

ui/views/controls/combobox/combobox.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_COMBOBOX_COMBOBOX_H_
 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
@@ skipping 10 matching lines @@
 class MenuModel;
 }
 
 namespace views {
 namespace test {
 class ComboboxTestApi;
 }
 
 class ComboboxListener;
 class CustomButton;
+class MenuModelAdapter;
 class MenuRunner;
 class Painter;
 class PrefixSelector;
 
 // A non-editable combobox (aka a drop-down list or selector).
 // Combobox has two distinct parts, the drop down arrow and the text. Combobox
 // offers two distinct behaviors:
 // * STYLE_NORMAL: typical combobox, clicking on the text and/or button shows
 // the drop down, arrow keys change selection, selected index can be changed by
 // the user to something other than the first item.
@@ skipping 65 matching lines @@
   void ButtonPressed(Button* sender, const ui::Event& event) override;
 
  protected:
   void set_size_to_largest_label(bool size_to_largest_label) {
     size_to_largest_label_ = size_to_largest_label;
   }
 
  private:
   friend class test::ComboboxTestApi;
 
-  class ComboboxMenuModelAdapter;
+  class ComboboxMenuModel;
 
   // Updates the border according to the current state.
   void UpdateBorder();
 
   // Given bounds within our View, this helper mirrors the bounds if necessary.
   void AdjustBoundsForRTLUI(gfx::Rect* rect) const;
 
   // Draws the selected value of the drop down list
   void PaintText(gfx::Canvas* canvas);
 
   // Draws the button images.
   void PaintButtons(gfx::Canvas* canvas);
 
   // Show the drop down list
   void ShowDropDownMenu(ui::MenuSourceType source_type);
 
+  // Cleans up after the menu as closed
+  void OnMenuClosed(Button::ButtonState original_button_state);
+
   // Called when the selection is changed by the user.
   void OnPerformAction();
 
   int GetDisclosureArrowLeftPadding() const;
   int GetDisclosureArrowRightPadding() const;
 
   // Returns the size of the disclosure arrow.
   gfx::Size ArrowSize() const;
 
   // Finds the size of the largest menu label or, for STYLE_ACTION, the size of
@@ skipping 22 matching lines @@
 
   // True when the selection is visually denoted as invalid.
   bool invalid_;
 
   // The accessible name of this combobox.
   base::string16 accessible_name_;
 
   // A helper used to select entries by keyboard input.
   std::unique_ptr<PrefixSelector> selector_;
 
-  // Adapts a ComboboxModel for use by a views MenuRunner.
-  std::unique_ptr<ui::MenuModel> menu_model_adapter_;
+  // The ComboboxModel for use by |menu_runner_|.
+  std::unique_ptr<ui::MenuModel> menu_model_;
 
   // Like MenuButton, we use a time object in order to keep track of when the
   // combobox was closed. The time is used for simulating menu behavior; that
   // is, if the menu is shown and the button is pressed, we need to close the
   // menu. There is no clean way to get the second click event because the
   // menu is displayed using a modal loop and, unlike regular menus in Windows,
   // the button is not part of the displayed menu.
   base::Time closed_time_;
 
   // The maximum dimensions of the content in the dropdown.
@@ skipping 10 matching lines @@
   // placed on top of this combobox as child views, accept event and manage the
   // button states. These are not rendered but when |style_| is
   // STYLE_NOTIFY_ON_CLICK, a Combobox renders the button images according to
   // these button states.
   // The base View takes the ownerships of these as child views.
   CustomButton* text_button_;
   CustomButton* arrow_button_;
 
   // Set while the dropdown is showing. Ensures the menu is closed if |this| is
   // destroyed.
-  std::unique_ptr<views::MenuRunner> menu_runner_;
+  std::unique_ptr<MenuModelAdapter> menu_model_adapter_;
+  std::unique_ptr<MenuRunner> menu_runner_;
 
   // The image to be drawn for this combobox's arrow.
   gfx::ImageSkia arrow_image_;
 
   // When true, the size of contents is defined by the selected label.
   // Otherwise, it's defined by the widest label in the menu. If this is set to
   // true, the parent view must relayout in ChildPreferredSizeChanged().
   bool size_to_largest_label_;
 
   // Used for making calbacks.
   base::WeakPtrFactory<Combobox> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Combobox);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_