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

Unified Diff: chrome/browser/chromeos/cros/power_library.cc

Issue 8566024: chromeos: call GetIdleTime from power manager client (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed omission of callback.h Created 9 years, 1 month 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
Index: chrome/browser/chromeos/cros/power_library.cc
diff --git a/chrome/browser/chromeos/cros/power_library.cc b/chrome/browser/chromeos/cros/power_library.cc
index bc0c4e24f15146e86b2b5717acf6c1ad082e427e..ad46f69eb65749e0984e8e986283c9d920a44d9e 100644
--- a/chrome/browser/chromeos/cros/power_library.cc
+++ b/chrome/browser/chromeos/cros/power_library.cc
@@ -48,12 +48,6 @@ class PowerLibraryImpl : public PowerLibrary {
observers_.RemoveObserver(observer);
}
- virtual void CalculateIdleTime(CalculateIdleTimeCallback* callback) OVERRIDE {
- // TODO(sidor): Examine if it's really a good idea to use void* as a second
- // argument.
- chromeos::GetIdleTime(&GetIdleTimeCallback, callback);
- }
-
virtual void EnableScreenLock(bool enable) OVERRIDE {
// Called when the screen preference is changed, which should always
// run on UI thread.
@@ -72,21 +66,6 @@ class PowerLibraryImpl : public PowerLibrary {
chromeos::EnableScreenLock(enable);
}
- static void GetIdleTimeCallback(void* object,
- int64_t time_idle_ms,
- bool success) {
- DCHECK(object);
- CalculateIdleTimeCallback* notify =
- static_cast<CalculateIdleTimeCallback*>(object);
- if (success) {
- notify->Run(time_idle_ms/1000);
- } else {
- LOG(ERROR) << "Power manager failed to calculate idle time.";
- notify->Run(-1);
- }
- delete notify;
- }
-
static void SystemResumedHandler(void* object) {
PowerLibraryImpl* power = static_cast<PowerLibraryImpl*>(object);
power->SystemResumed();
@@ -126,11 +105,6 @@ class PowerLibraryStubImpl : public PowerLibrary {
observers_.RemoveObserver(observer);
}
- virtual void CalculateIdleTime(CalculateIdleTimeCallback* callback) OVERRIDE {
- callback->Run(0);
- delete callback;
- }
-
virtual void EnableScreenLock(bool enable) OVERRIDE {}
// End PowerLibrary implementation.
« no previous file with comments | « chrome/browser/chromeos/cros/power_library.h ('k') | chrome/browser/chromeos/dbus/mock_power_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698