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

Unified Diff: ui/views/controls/menu/menu_runner_impl_cocoa.mm

Issue 1876013002: Fixed potential crash on destroying MenuRunnerImplCocoa. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review fixes. Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/menu/menu_runner_impl_cocoa.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_runner_impl_cocoa.mm
diff --git a/ui/views/controls/menu/menu_runner_impl_cocoa.mm b/ui/views/controls/menu/menu_runner_impl_cocoa.mm
index 454c951817bbf6cba4efaf8acea43c8038dee911..c6802381ab6c221eb9645b6e965f113b00fa0504 100644
--- a/ui/views/controls/menu/menu_runner_impl_cocoa.mm
+++ b/ui/views/controls/menu/menu_runner_impl_cocoa.mm
@@ -93,13 +93,15 @@ MenuRunnerImplInterface* MenuRunnerImplInterface::Create(
}
MenuRunnerImplCocoa::MenuRunnerImplCocoa(ui::MenuModel* menu)
- : delete_after_run_(false), closing_event_time_(base::TimeDelta()) {
+ : running_(false),
+ delete_after_run_(false),
+ closing_event_time_(base::TimeDelta()) {
menu_controller_.reset(
[[MenuController alloc] initWithModel:menu useWithPopUpButtonCell:NO]);
}
bool MenuRunnerImplCocoa::IsRunning() const {
- return [menu_controller_ isMenuOpen];
+ return running_;
}
void MenuRunnerImplCocoa::Release() {
@@ -123,6 +125,7 @@ MenuRunner::RunResult MenuRunnerImplCocoa::RunMenuAt(Widget* parent,
DCHECK(!IsRunning());
DCHECK(parent);
closing_event_time_ = base::TimeDelta();
+ running_ = true;
if (run_types & MenuRunner::CONTEXT_MENU) {
[NSMenu popUpContextMenu:[menu_controller_ menu]
@@ -143,6 +146,7 @@ MenuRunner::RunResult MenuRunnerImplCocoa::RunMenuAt(Widget* parent,
}
closing_event_time_ = ui::EventTimeForNow();
+ running_ = false;
if (delete_after_run_) {
delete this;
« no previous file with comments | « ui/views/controls/menu/menu_runner_impl_cocoa.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698