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

Unified Diff: views/touchui/touch_selection_controller_impl.cc

Issue 7824041: Update base/timer.h code to pass through Location from call sites. (reland) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: touch Created 9 years, 4 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 | « views/touchui/touch_factory.cc ('k') | views/widget/tooltip_manager_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/touchui/touch_selection_controller_impl.cc
diff --git a/views/touchui/touch_selection_controller_impl.cc b/views/touchui/touch_selection_controller_impl.cc
index eff3be63e195a3631f866e9a43184484bd63dfad..a34b6becf097497ac9e3270643ed1b98d65adef3 100644
--- a/views/touchui/touch_selection_controller_impl.cc
+++ b/views/touchui/touch_selection_controller_impl.cc
@@ -311,6 +311,7 @@ void TouchSelectionControllerImpl::SelectionHandleDragged(
// We do not want to show the context menu while dragging.
HideContextMenu();
context_menu_timer_.Start(
+ FROM_HERE,
base::TimeDelta::FromMilliseconds(kContextMenuTimoutMs),
this,
&TouchSelectionControllerImpl::ContextMenuTimerFired);
@@ -387,6 +388,7 @@ void TouchSelectionControllerImpl::UpdateContextMenu(const gfx::Point& p1,
// If there is selection, we restart the context menu timer.
if (p1 != p2) {
context_menu_timer_.Start(
+ FROM_HERE,
base::TimeDelta::FromMilliseconds(kContextMenuTimoutMs),
this,
&TouchSelectionControllerImpl::ContextMenuTimerFired);
« no previous file with comments | « views/touchui/touch_factory.cc ('k') | views/widget/tooltip_manager_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698