Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: ui/views/controls/menu/menu_runner.cc

Issue 2394123002: Views: Expose an on_closed callback via the MenuRunner constructor. (Closed)
Patch Set: Back to Patch set 6 Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/callback.h"
9 #include "ui/views/controls/menu/menu_runner_handler.h" 10 #include "ui/views/controls/menu/menu_runner_handler.h"
10 #include "ui/views/controls/menu/menu_runner_impl.h" 11 #include "ui/views/controls/menu/menu_runner_impl.h"
11 12
12 namespace views { 13 namespace views {
13 14
15 MenuRunner::MenuRunner(ui::MenuModel* menu_model,
16 int32_t run_types,
17 const base::Closure& on_menu_closed_callback)
18 : run_types_(run_types),
19 impl_(
20 internal::MenuRunnerImplInterface::Create(menu_model,
21 run_types,
22 on_menu_closed_callback)) {}
23
14 MenuRunner::MenuRunner(ui::MenuModel* menu_model, int32_t run_types) 24 MenuRunner::MenuRunner(ui::MenuModel* menu_model, int32_t run_types)
15 : run_types_(run_types), 25 : MenuRunner(menu_model, run_types, base::Closure()) {}
16 impl_(internal::MenuRunnerImplInterface::Create(menu_model, run_types)) {}
17 26
18 MenuRunner::MenuRunner(MenuItemView* menu_view, int32_t run_types) 27 MenuRunner::MenuRunner(MenuItemView* menu_view, int32_t run_types)
19 : run_types_(run_types), impl_(new internal::MenuRunnerImpl(menu_view)) {} 28 : run_types_(run_types), impl_(new internal::MenuRunnerImpl(menu_view)) {}
20 29
21 MenuRunner::~MenuRunner() { 30 MenuRunner::~MenuRunner() {
22 impl_->Release(); 31 impl_->Release();
23 } 32 }
24 33
25 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent, 34 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent,
26 MenuButton* button, 35 MenuButton* button,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 base::TimeTicks MenuRunner::closing_event_time() const { 79 base::TimeTicks MenuRunner::closing_event_time() const {
71 return impl_->GetClosingEventTime(); 80 return impl_->GetClosingEventTime();
72 } 81 }
73 82
74 void MenuRunner::SetRunnerHandler( 83 void MenuRunner::SetRunnerHandler(
75 std::unique_ptr<MenuRunnerHandler> runner_handler) { 84 std::unique_ptr<MenuRunnerHandler> runner_handler) {
76 runner_handler_ = std::move(runner_handler); 85 runner_handler_ = std::move(runner_handler);
77 } 86 }
78 87
79 } // namespace views 88 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698