ui/views/controls/menu/menu_runner_cocoa_unittest.mm - Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks

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_cocoa_unittest.mm

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge master Created 4 years, 7 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_controller.cc ('k') | ui/views/controls/menu/menu_runner_impl_cocoa.mm » ('j') | ui/views/controls/menu/menu_runner_impl_cocoa.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/menu/menu_runner_cocoa_unittest.mm

diff --git a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm

index ee86b98275691c9349bcf84962c0bf5838d70af2..58ab461eb5d9dffa793ad4aa9e556f17df31a08f 100644

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

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

@@ -166,7 +166,7 @@ class MenuRunnerCocoaTest : public ViewsTestBase {

};

TEST_F(MenuRunnerCocoaTest, RunMenuAndCancel) {

- base::TimeDelta min_time = ui::EventTimeForNow();

+ base::TimeDelta min_time = (ui::EventTimeForNow() - base::TimeTicks());

MenuRunner::RunResult result = RunMenu(base::Bind(

&MenuRunnerCocoaTest::MenuCancelCallback, base::Unretained(this)));

@@ -175,7 +175,8 @@ TEST_F(MenuRunnerCocoaTest, RunMenuAndCancel) {

EXPECT_FALSE(runner_->IsRunning());

EXPECT_GE(runner_->GetClosingEventTime(), min_time);

- EXPECT_LE(runner_->GetClosingEventTime(), ui::EventTimeForNow());

+ EXPECT_LE(runner_->GetClosingEventTime(),

+ (ui::EventTimeForNow() - base::TimeTicks()));

// Cancel again.

runner_->Cancel();