ui/views/controls/menu/menu_runner_impl_cocoa.mm - Issue 2094193002: Deflake Mac views_unittest's MenuRunnerCocoaTest.RunMenuAndCancel

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2094193002: Deflake Mac views_unittest's MenuRunnerCocoaTest.RunMenuAndCancel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Lint Created 4 years, 6 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

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 5f49f876ff2c4ba2260ba6efba7d85d611ad8875..f04c2eb2137fe934a57d7680a1c38a9fc721d607 100644

--- a/ui/views/controls/menu/menu_runner_impl_cocoa.mm

+++ b/ui/views/controls/menu/menu_runner_impl_cocoa.mm

@@ -7,6 +7,7 @@

#include "base/mac/sdk_forward_declarations.h"

#import "ui/base/cocoa/menu_controller.h"

#include "ui/base/models/menu_model.h"

+#include "ui/events/base_event_utils.h"

#include "ui/events/event_utils.h"

#include "ui/gfx/geometry/rect.h"

#include "ui/gfx/mac/coordinate_conversion.h"

@@ -145,7 +146,7 @@ MenuRunner::RunResult MenuRunnerImplCocoa::RunMenuAt(Widget* parent,

NOTREACHED();

}

- closing_event_time_ = base::TimeTicks::Now();

+ closing_event_time_ = ui::EventTimeForNow();

running_ = false;

if (delete_after_run_) {

« no previous file with comments | « ui/views/controls/menu/menu_runner_cocoa_unittest.mm ('k') | no next file » | no next file with comments »