diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 18:23:02 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 18:23:02 +0000 |
| commit | d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff (patch) | |
| tree | 5a6b91bcea70978cbf9b63000ed5f798d532f9b7 /chrome/browser/printing | |
| parent | b1bb86d4d58f736fb980b8611ccf43d79e7b5b2b (diff) | |
| download | chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.zip chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.tar.gz chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/printing')
| -rw-r--r-- | chrome/browser/printing/print_job.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/printing/print_view_manager.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index c1e61e3..0b180a2 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -183,7 +183,7 @@ bool PrintJob::FlushJob(int timeout_ms) { // wrong. base::OneShotTimer<MessageLoop> quit_task; if (timeout_ms) { - quit_task.Start(TimeDelta::FromMilliseconds(timeout_ms), + quit_task.Start(FROM_HERE, TimeDelta::FromMilliseconds(timeout_ms), MessageLoop::current(), &MessageLoop::Quit); } diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 2fbd080..015b1f3 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -481,7 +481,8 @@ bool PrintViewManager::RunInnerMessageLoop() { // memory-bound. static const int kPrinterSettingsTimeout = 60000; base::OneShotTimer<MessageLoop> quit_timer; - quit_timer.Start(TimeDelta::FromMilliseconds(kPrinterSettingsTimeout), + quit_timer.Start(FROM_HERE, + TimeDelta::FromMilliseconds(kPrinterSettingsTimeout), MessageLoop::current(), &MessageLoop::Quit); inside_inner_message_loop_ = true; |