Add the button style for combobox

ui/views/controls/menu/menu_runner.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_runner.h"
 
 #include <set>
 
 #include "base/memory/weak_ptr.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_controller_delegate.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
+#include "ui/views/controls/menu/menu_runner_core.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif
 
 namespace views {
 
 namespace internal {
 
@@ skipping 258 matching lines @@
 DisplayChangeListener* DisplayChangeListener::Create(Widget* widget,
                                                      MenuRunner* runner) {
   return NULL;
 }
 #endif
 
 }  // namespace internal
 
 MenuRunner::MenuRunner(ui::MenuModel* menu_model)
     : menu_model_adapter_(new MenuModelAdapter(menu_model)),
-      holder_(new internal::MenuRunnerImpl(menu_model_adapter_->CreateMenu())) {
+      holder_(new internal::MenuRunnerImpl(menu_model_adapter_->CreateMenu())),
+      runner_core_(NULL) {
 }
 
 MenuRunner::MenuRunner(MenuItemView* menu)
-    : holder_(new internal::MenuRunnerImpl(menu)) {
+    : holder_(new internal::MenuRunnerImpl(menu)),
+      runner_core_(NULL) {
 }
 
 MenuRunner::~MenuRunner() {
   holder_->Release();
 }
 
 MenuItemView* MenuRunner::GetMenu() {
   return holder_->menu();
 }
 
 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent,
                                             MenuButton* button,
                                             const gfx::Rect& bounds,
                                             MenuItemView::AnchorPosition anchor,
                                             ui::MenuSourceType source_type,
                                             int32 types) {
+  if (runner_core_) {
+    return runner_core_->RunMenuAt(parent, button, bounds, anchor, source_type,
+                                   types);
+  }
+
   // The parent of the nested menu will have created a DisplayChangeListener, so
   // we avoid creating a DisplayChangeListener if nested. Drop menus are
   // transient, so we don't cancel in that case.
   if ((types & (IS_NESTED | FOR_DROP)) == 0 && parent) {
     display_change_listener_.reset(
         internal::DisplayChangeListener::Create(parent, this));
   }
 
   if (types & CONTEXT_MENU) {
     switch (source_type) {
@@ skipping 20 matching lines @@
 
 void MenuRunner::Cancel() {
   holder_->Cancel();
 }
 
 base::TimeDelta MenuRunner::closing_event_time() const {
   return holder_->closing_event_time();
 }
 
 }  // namespace views