Update base/timer.h code to pass through Location from call sites. (reland) original CL w/LGTMs: http://codereview.chromium.org/7812036/

Review URL: http://codereview.chromium.org/7824041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99409 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 1 deletions

diff --git a/views/touchui/touch_factory.cc b/views/touchui/touch_factory.cc
index 6580228..81dd41d 100644
--- a/views/touchui/touch_factory.cc
+++ b/views/touchui/touch_factory.cc
@@ -351,7 +351,8 @@ void TouchFactory::SetCursorVisible(bool show, bool start_timer) {
   // The cursor is going to be shown. Reset the timer for hiding it.
   if (show && start_timer) {
     cursor_timer_.Stop();
-    cursor_timer_.Start(base::TimeDelta::FromSeconds(kCursorIdleSeconds),
+    cursor_timer_.Start(
+        FROM_HERE, base::TimeDelta::FromSeconds(kCursorIdleSeconds),
         this, &TouchFactory::HideCursorForInactivity);
   } else {
     cursor_timer_.Stop();
diff --git a/views/touchui/touch_selection_controller_impl.cc b/views/touchui/touch_selection_controller_impl.cc
index eff3be6..a34b6be 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);