Add the button style for combobox

ui/views/controls/menu/menu_runner.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_RUNNER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 
 namespace ui {
 class MenuModel;
 }
 
 namespace views {
 
 class MenuButton;
 class MenuModelAdapter;
+class MenuRunnerHandler;
 class Widget;
 
 namespace internal {
 class DisplayChangeListener;
 class MenuRunnerImpl;
 }
 
+namespace test {
+class MenuRunnerTestAPI;
+}
+
 // MenuRunner is responsible for showing (running) the menu and additionally
 // owning the MenuItemView. RunMenuAt() runs a nested message loop. It is safe
 // to delete MenuRunner at any point, but MenuRunner internally only deletes the
 // MenuItemView *after* the nested message loop completes. If MenuRunner is
 // deleted while the menu is showing the delegate of the menu is reset. This is
 // done to ensure delegates aren't notified after they may have been deleted.
 //
 // NOTE: while you can delete a MenuRunner at any point, the nested message loop
 // won't return immediately. This means if you delete the object that owns
 // the MenuRunner while the menu is running, your object is effectively still
@@ skipping 67 matching lines @@
   // Returns true if we're in a nested message loop running the menu.
   bool IsRunning() const;
 
   // Hides and cancels the menu. This does nothing if the menu is not open.
   void Cancel();
 
   // Returns the time from the event which closed the menu - or 0.
   base::TimeDelta closing_event_time() const;
 
  private:
+  friend class test::MenuRunnerTestAPI;
+
+  // Sets an implementation of RunMenuAt. This takes the ownership of
+  // |runner_handler|. This is intended to be used at test.
+  void SetRunnerHandler(MenuRunnerHandler* runner_handler);

[sky, 2013/12/10 16:56:06]

scoped_ptr

[hajimehoshi, 2013/12/11 04:07:04]

Done.

+
   scoped_ptr<MenuModelAdapter> menu_model_adapter_;
 
   internal::MenuRunnerImpl* holder_;
 
+  // An implementation of RunMenuAt. This is usually NULL and ignored. If this
+  // is not NULL, this implementation will be used.
+  scoped_ptr<MenuRunnerHandler> runner_handler_;
+
   scoped_ptr<internal::DisplayChangeListener> display_change_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuRunner);
 };
 
 namespace internal {
 
 // DisplayChangeListener is intended to listen for changes in the display size
 // and cancel the menu. DisplayChangeListener is created when the menu is
 // shown.
 class DisplayChangeListener {
  public:
   virtual ~DisplayChangeListener() {}
 
   // Creates the platform specified DisplayChangeListener, or NULL if there
   // isn't one. Caller owns the returned value.
   static DisplayChangeListener* Create(Widget* parent,
                                        MenuRunner* runner);
 
  protected:
   DisplayChangeListener() {}
 };
 
 }
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_