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

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

Issue 2394123002: Views: Expose an on_closed callback via the MenuRunner constructor. (Closed)
Patch Set: default arg 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 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_adapter.h" 5 #include "ui/views/controls/menu/menu_runner_impl_adapter.h"
6 6
7 #include "ui/views/controls/menu/menu_model_adapter.h" 7 #include "ui/views/controls/menu/menu_model_adapter.h"
8 #include "ui/views/controls/menu/menu_runner_impl.h" 8 #include "ui/views/controls/menu/menu_runner_impl.h"
9 9
10 namespace views { 10 namespace views {
11 namespace internal { 11 namespace internal {
12 12
13 MenuRunnerImplAdapter::MenuRunnerImplAdapter(ui::MenuModel* menu_model) 13 MenuRunnerImplAdapter::MenuRunnerImplAdapter(
14 : menu_model_adapter_(new MenuModelAdapter(menu_model)), 14 ui::MenuModel* menu_model,
15 impl_(new MenuRunnerImpl(menu_model_adapter_->CreateMenu())) { 15 const base::Closure& on_menu_done_callback)
16 } 16 : menu_model_adapter_(
17 new MenuModelAdapter(menu_model, on_menu_done_callback)),
18 impl_(new MenuRunnerImpl(menu_model_adapter_->CreateMenu())) {}
17 19
18 bool MenuRunnerImplAdapter::IsRunning() const { 20 bool MenuRunnerImplAdapter::IsRunning() const {
19 return impl_->IsRunning(); 21 return impl_->IsRunning();
20 } 22 }
21 23
22 void MenuRunnerImplAdapter::Release() { 24 void MenuRunnerImplAdapter::Release() {
23 impl_->Release(); 25 impl_->Release();
24 delete this; 26 delete this;
25 } 27 }
26 28
(...skipping 12 matching lines...) Expand all
39 41
40 base::TimeTicks MenuRunnerImplAdapter::GetClosingEventTime() const { 42 base::TimeTicks MenuRunnerImplAdapter::GetClosingEventTime() const {
41 return impl_->GetClosingEventTime(); 43 return impl_->GetClosingEventTime();
42 } 44 }
43 45
44 MenuRunnerImplAdapter::~MenuRunnerImplAdapter() { 46 MenuRunnerImplAdapter::~MenuRunnerImplAdapter() {
45 } 47 }
46 48
47 } // namespace internal 49 } // namespace internal
48 } // namespace views 50 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_runner_impl_adapter.h ('k') | ui/views/controls/menu/menu_runner_impl_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698