From 6402b23041ffafeaba33c5ad824115bdf8f8bae0 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 18 Dec 2017 13:35:17 +1100 Subject: [PATCH] tracked_objects::Location --> base::Location --- atom/browser/bridge_task_runner.cc | 4 ++-- atom/browser/bridge_task_runner.h | 7 ++++--- chromium_src/chrome/browser/printing/print_job_worker.cc | 2 +- chromium_src/chrome/browser/printing/print_job_worker.h | 3 ++- .../chrome/browser/printing/print_job_worker_owner.cc | 2 +- .../chrome/browser/printing/print_job_worker_owner.h | 7 ++----- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/atom/browser/bridge_task_runner.cc b/atom/browser/bridge_task_runner.cc index bdde5f3a40c5..f0a6206f3464 100644 --- a/atom/browser/bridge_task_runner.cc +++ b/atom/browser/bridge_task_runner.cc @@ -22,7 +22,7 @@ void BridgeTaskRunner::MessageLoopIsReady() { } bool BridgeTaskRunner::PostDelayedTask( - const tracked_objects::Location& from_here, + const base::Location& from_here, base::OnceClosure task, base::TimeDelta delay) { auto message_loop = base::MessageLoop::current(); @@ -44,7 +44,7 @@ bool BridgeTaskRunner::RunsTasksInCurrentSequence() const { } bool BridgeTaskRunner::PostNonNestableDelayedTask( - const tracked_objects::Location& from_here, + const base::Location& from_here, base::OnceClosure task, base::TimeDelta delay) { auto message_loop = base::MessageLoop::current(); diff --git a/atom/browser/bridge_task_runner.h b/atom/browser/bridge_task_runner.h index 07dee3e6ce98..cf04daa6f1c4 100644 --- a/atom/browser/bridge_task_runner.h +++ b/atom/browser/bridge_task_runner.h @@ -8,6 +8,7 @@ #include #include +#include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/tuple.h" @@ -24,18 +25,18 @@ class BridgeTaskRunner : public base::SingleThreadTaskRunner { void MessageLoopIsReady(); // base::SingleThreadTaskRunner: - bool PostDelayedTask(const tracked_objects::Location& from_here, + bool PostDelayedTask(const base::Location& from_here, base::OnceClosure task, base::TimeDelta delay) override; bool RunsTasksInCurrentSequence() const override; bool PostNonNestableDelayedTask( - const tracked_objects::Location& from_here, + const base::Location& from_here, base::OnceClosure task, base::TimeDelta delay) override; private: using TaskPair = std::tuple< - tracked_objects::Location, base::OnceClosure, base::TimeDelta>; + base::Location, base::OnceClosure, base::TimeDelta>; std::vector tasks_; std::vector non_nestable_tasks_; diff --git a/chromium_src/chrome/browser/printing/print_job_worker.cc b/chromium_src/chrome/browser/printing/print_job_worker.cc index 5d13994134b0..a0e3e3ff40f0 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.cc +++ b/chromium_src/chrome/browser/printing/print_job_worker.cc @@ -424,7 +424,7 @@ bool PrintJobWorker::IsRunning() const { return thread_.IsRunning(); } -bool PrintJobWorker::PostTask(const tracked_objects::Location& from_here, +bool PrintJobWorker::PostTask(const base::Location& from_here, const base::Closure& task) { if (task_runner_.get()) return task_runner_->PostTask(from_here, task); diff --git a/chromium_src/chrome/browser/printing/print_job_worker.h b/chromium_src/chrome/browser/printing/print_job_worker.h index 7d146bc34d6b..b6b144f9081d 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.h +++ b/chromium_src/chrome/browser/printing/print_job_worker.h @@ -7,6 +7,7 @@ #include +#include "base/location.h" #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" @@ -76,7 +77,7 @@ class PrintJobWorker { bool IsRunning() const; // Posts the given task to be run. - bool PostTask(const tracked_objects::Location& from_here, + bool PostTask(const base::Location& from_here, const base::Closure& task); // Signals the thread to exit in the near future. diff --git a/chromium_src/chrome/browser/printing/print_job_worker_owner.cc b/chromium_src/chrome/browser/printing/print_job_worker_owner.cc index ea08de23ae46..60b8473f0fb2 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker_owner.cc +++ b/chromium_src/chrome/browser/printing/print_job_worker_owner.cc @@ -20,7 +20,7 @@ bool PrintJobWorkerOwner::RunsTasksInCurrentSequence() const { return task_runner_->RunsTasksInCurrentSequence(); } -bool PrintJobWorkerOwner::PostTask(const tracked_objects::Location& from_here, +bool PrintJobWorkerOwner::PostTask(const base::Location& from_here, const base::Closure& task) { return task_runner_->PostTask(from_here, task); } diff --git a/chromium_src/chrome/browser/printing/print_job_worker_owner.h b/chromium_src/chrome/browser/printing/print_job_worker_owner.h index aaa355a0ba1a..0e3605ea5068 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker_owner.h +++ b/chromium_src/chrome/browser/printing/print_job_worker_owner.h @@ -7,6 +7,7 @@ #include +#include "base/location.h" #include "base/memory/ref_counted.h" #include "printing/printing_context.h" @@ -15,10 +16,6 @@ class MessageLoop; class SequencedTaskRunner; } -namespace tracked_objects { -class Location; -} - namespace printing { class PrintJobWorker; @@ -51,7 +48,7 @@ class PrintJobWorkerOwner bool RunsTasksInCurrentSequence() const; // Posts the given task to be run. - bool PostTask(const tracked_objects::Location& from_here, + bool PostTask(const base::Location& from_here, const base::Closure& task); protected: