summaryrefslogtreecommitdiffstats
path: root/chrome/browser/process_singleton_linux.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 02:28:56 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 02:28:56 +0000
commit6fd550bdd8d9ad83330bed01efa25d801379e9f9 (patch)
tree6e8031e453ffeb9e192f1eafbf18ea8d4c54657c /chrome/browser/process_singleton_linux.cc
parentdd8d12a86e01b35b76f4add67cf5e222a475662b (diff)
downloadchromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.zip
chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.gz
chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.bz2
Revert "Currently, base/timer.cc calls PostTask with FROM_HERE as the Location,
so the original code that created the delayed callback is lost." This reverts commit 4cf5cf73d319b69c32ad30af8954235755856455. (r99284) TBR=jbates@chromium.org Review URL: http://codereview.chromium.org/7825026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_linux.cc')
-rw-r--r--chrome/browser/process_singleton_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc
index f4808e6..9055e59 100644
--- a/chrome/browser/process_singleton_linux.cc
+++ b/chrome/browser/process_singleton_linux.cc
@@ -470,7 +470,7 @@ class ProcessSingleton::LinuxWatcher
// Wait for reads.
MessageLoopForIO::current()->WatchFileDescriptor(
fd, true, MessageLoopForIO::WATCH_READ, &fd_reader_, this);
- timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeoutInSeconds),
+ timer_.Start(base::TimeDelta::FromSeconds(kTimeoutInSeconds),
this, &SocketReader::OnTimerExpiry);
}