| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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.h" | 5 #include "ui/views/controls/menu/menu_runner.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ui/views/controls/menu/menu_runner_handler.h" | 9 #include "ui/views/controls/menu/menu_runner_handler.h" |
| 10 #include "ui/views/controls/menu/menu_runner_impl.h" | 10 #include "ui/views/controls/menu/menu_runner_impl.h" |
| 11 | 11 |
| 12 namespace views { | 12 namespace views { |
| 13 | 13 |
| 14 MenuRunner::MenuRunner(ui::MenuModel* menu_model, int32_t run_types) | 14 MenuRunner::MenuRunner(ui::MenuModel* menu_model, |
| 15 int32_t run_types, |
| 16 const base::Closure& on_menu_closed_callback) |
| 15 : run_types_(run_types), | 17 : run_types_(run_types), |
| 16 impl_(internal::MenuRunnerImplInterface::Create(menu_model, run_types)) {} | 18 impl_( |
| 19 internal::MenuRunnerImplInterface::Create(menu_model, |
| 20 run_types, |
| 21 on_menu_closed_callback)) {} |
| 17 | 22 |
| 18 MenuRunner::MenuRunner(MenuItemView* menu_view, int32_t run_types) | 23 MenuRunner::MenuRunner(MenuItemView* menu_view, int32_t run_types) |
| 19 : run_types_(run_types), impl_(new internal::MenuRunnerImpl(menu_view)) {} | 24 : run_types_(run_types), impl_(new internal::MenuRunnerImpl(menu_view)) {} |
| 20 | 25 |
| 21 MenuRunner::~MenuRunner() { | 26 MenuRunner::~MenuRunner() { |
| 22 impl_->Release(); | 27 impl_->Release(); |
| 23 } | 28 } |
| 24 | 29 |
| 25 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent, | 30 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent, |
| 26 MenuButton* button, | 31 MenuButton* button, |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 base::TimeTicks MenuRunner::closing_event_time() const { | 75 base::TimeTicks MenuRunner::closing_event_time() const { |
| 71 return impl_->GetClosingEventTime(); | 76 return impl_->GetClosingEventTime(); |
| 72 } | 77 } |
| 73 | 78 |
| 74 void MenuRunner::SetRunnerHandler( | 79 void MenuRunner::SetRunnerHandler( |
| 75 std::unique_ptr<MenuRunnerHandler> runner_handler) { | 80 std::unique_ptr<MenuRunnerHandler> runner_handler) { |
| 76 runner_handler_ = std::move(runner_handler); | 81 runner_handler_ = std::move(runner_handler); |
| 77 } | 82 } |
| 78 | 83 |
| 79 } // namespace views | 84 } // namespace views |
| OLD | NEW |