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

Unified Diff: content/browser/power_save_blocker_chromeos.cc

Issue 2006143006: Revert of Pass SequencedTaskRunner to PowerSaveBlocker for ui/file operations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@device-power-save-blocker
Patch Set: Created 4 years, 7 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 | « content/browser/power_save_blocker_android.cc ('k') | content/browser/power_save_blocker_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/power_save_blocker_chromeos.cc
diff --git a/content/browser/power_save_blocker_chromeos.cc b/content/browser/power_save_blocker_chromeos.cc
index 6da18f9f11a0a56a85c7e0bfa0afb58547ff1619..bf50c89845198670935dff49fd4d4970696468f0 100644
--- a/content/browser/power_save_blocker_chromeos.cc
+++ b/content/browser/power_save_blocker_chromeos.cc
@@ -12,6 +12,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "chromeos/dbus/power_policy_controller.h"
+#include "content/public/browser/browser_thread.h"
namespace content {
@@ -39,16 +40,11 @@
public:
Delegate(PowerSaveBlockerType type,
Reason reason,
- const std::string& description,
- scoped_refptr<base::SequencedTaskRunner> ui_task_runner)
- : type_(type),
- reason_(reason),
- description_(description),
- block_id_(0),
- ui_task_runner_(ui_task_runner) {}
+ const std::string& description)
+ : type_(type), reason_(reason), description_(description), block_id_(0) {}
void ApplyBlock() {
- DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (!chromeos::PowerPolicyController::IsInitialized())
return;
@@ -68,7 +64,7 @@
}
void RemoveBlock() {
- DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (!chromeos::PowerPolicyController::IsInitialized())
return;
@@ -86,27 +82,20 @@
// ID corresponding to the block request in PowerPolicyController.
int block_id_;
- scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
-
DISALLOW_COPY_AND_ASSIGN(Delegate);
};
-PowerSaveBlockerImpl::PowerSaveBlockerImpl(
- PowerSaveBlockerType type,
- Reason reason,
- const std::string& description,
- scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
- scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
- : delegate_(new Delegate(type, reason, description, ui_task_runner)),
- ui_task_runner_(ui_task_runner),
- blocking_task_runner_(blocking_task_runner) {
- ui_task_runner_->PostTask(FROM_HERE,
- base::Bind(&Delegate::ApplyBlock, delegate_));
+PowerSaveBlockerImpl::PowerSaveBlockerImpl(PowerSaveBlockerType type,
+ Reason reason,
+ const std::string& description)
+ : delegate_(new Delegate(type, reason, description)) {
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ base::Bind(&Delegate::ApplyBlock, delegate_));
}
PowerSaveBlockerImpl::~PowerSaveBlockerImpl() {
- ui_task_runner_->PostTask(FROM_HERE,
- base::Bind(&Delegate::RemoveBlock, delegate_));
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ base::Bind(&Delegate::RemoveBlock, delegate_));
}
} // namespace content
« no previous file with comments | « content/browser/power_save_blocker_android.cc ('k') | content/browser/power_save_blocker_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698