ui/views/controls/menu/menu_controller.cc - Issue 10417035: Add 'base::' to Time::Now()

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_controller.cc

Issue 10417035: Add 'base::' to Time::Now() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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:

Index: ui/views/controls/menu/menu_controller.cc

diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc

index 7163eca032699378f21406a5870eeedf64a1615a..a09333c629d8c19db26952ab1b1ad8ea65c416d7 100644

--- a/ui/views/controls/menu/menu_controller.cc

+++ b/ui/views/controls/menu/menu_controller.cc

@@ -163,7 +163,7 @@ class MenuController::MenuScrollTask {

if (new_menu == submenu_ && is_scrolling_up_ == new_is_up)

return;

- start_scroll_time_ = Time::Now();

+ start_scroll_time_ = base::Time::Now();

start_y_ = part.submenu->GetVisibleBounds().y();

submenu_ = new_menu;

is_scrolling_up_ = new_is_up;

@@ -190,7 +190,7 @@ class MenuController::MenuScrollTask {

DCHECK(submenu_);

gfx::Rect vis_rect = submenu_->GetVisibleBounds();

const int delta_y = static_cast<int>(

- (Time::Now() - start_scroll_time_).InMilliseconds() *

+ (base::Time::Now() - start_scroll_time_).InMilliseconds() *

pixels_per_second_ / 1000);

vis_rect.set_y(is_scrolling_up_ ?

std::max(0, start_y_ - delta_y) :

« no previous file with comments | « no previous file | no next file » | no next file with comments »