| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/controls/menu/menu_runner_impl.h" | 5 #include "ui/views/controls/menu/menu_runner_impl.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "ui/native_theme/native_theme.h" | 8 #include "ui/native_theme/native_theme.h" |
| 9 #include "ui/views/controls/button/menu_button.h" | 9 #include "ui/views/controls/button/menu_button.h" |
| 10 #include "ui/views/controls/menu/menu_controller.h" | 10 #include "ui/views/controls/menu/menu_controller.h" |
| 11 #include "ui/views/controls/menu/menu_delegate.h" | 11 #include "ui/views/controls/menu/menu_delegate.h" |
| 12 #include "ui/views/controls/menu/menu_item_view.h" | 12 #include "ui/views/controls/menu/menu_item_view.h" |
| 13 #include "ui/views/controls/menu/menu_runner_impl_adapter.h" | 13 #include "ui/views/controls/menu/menu_runner_impl_adapter.h" |
| 14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 15 | 15 |
| 16 #if defined(OS_WIN) | 16 #if defined(OS_WIN) |
| 17 #include "ui/events/win/system_event_state_lookup.h" | 17 #include "ui/events/win/system_event_state_lookup.h" |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 namespace views { | 20 namespace views { |
| 21 namespace internal { | 21 namespace internal { |
| 22 | 22 |
| 23 #if !defined(OS_MACOSX) | 23 #if !defined(OS_MACOSX) |
| 24 MenuRunnerImplInterface* MenuRunnerImplInterface::Create( | 24 MenuRunnerImplInterface* MenuRunnerImplInterface::Create( |
| 25 ui::MenuModel* menu_model, | 25 ui::MenuModel* menu_model, |
| 26 int32_t run_types) { | 26 int32_t run_types, |
| 27 return new MenuRunnerImplAdapter(menu_model); | 27 const base::Closure& on_menu_closed_callback) { |
| 28 return new MenuRunnerImplAdapter(menu_model, on_menu_closed_callback); |
| 28 } | 29 } |
| 29 #endif | 30 #endif |
| 30 | 31 |
| 31 MenuRunnerImpl::MenuRunnerImpl(MenuItemView* menu) | 32 MenuRunnerImpl::MenuRunnerImpl(MenuItemView* menu) |
| 32 : menu_(menu), | 33 : menu_(menu), |
| 33 running_(false), | 34 running_(false), |
| 34 delete_after_run_(false), | 35 delete_after_run_(false), |
| 35 async_(false), | 36 async_(false), |
| 36 for_drop_(false), | 37 for_drop_(false), |
| 37 controller_(NULL), | 38 controller_(NULL), |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 #if defined(OS_WIN) | 224 #if defined(OS_WIN) |
| 224 // This is only needed on Windows. | 225 // This is only needed on Windows. |
| 225 if (!show_mnemonics) | 226 if (!show_mnemonics) |
| 226 show_mnemonics = ui::win::IsAltPressed(); | 227 show_mnemonics = ui::win::IsAltPressed(); |
| 227 #endif | 228 #endif |
| 228 return show_mnemonics; | 229 return show_mnemonics; |
| 229 } | 230 } |
| 230 | 231 |
| 231 } // namespace internal | 232 } // namespace internal |
| 232 } // namespace views | 233 } // namespace views |
| OLD | NEW |