chromeos: Update IdleActionImminent and SuspendDone handling

chromeos/dbus/power_manager_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
 #define CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 48 matching lines @@
 
     // Called when the system is about to suspend. Suspend is deferred until
     // all observers' implementations of this method have finished running.
     //
     // If an observer wishes to asynchronously delay suspend,
     // PowerManagerClient::GetSuspendReadinessCallback() may be called from
     // within SuspendImminent().  The returned callback must be called once
     // the observer is ready for suspend.
     virtual void SuspendImminent() {}
 
+    // Called when a suspend attempt (previously announced via
+    // SuspendImminent()) has completed. The system may not have actually
+    // suspended (if e.g. the user canceled the suspend attempt).
+    virtual void SuspendDone(const base::TimeDelta& sleep_duration) {}
+
     // Called when the power button is pressed or released.
     virtual void PowerButtonEventReceived(bool down,
                                           const base::TimeTicks& timestamp) {}
 
     // Called when the device's lid is opened or closed.
     virtual void LidEventReceived(bool open,
                                   const base::TimeTicks& timestamp) {}
 
-    // Called when the system resumes from sleep.
-    virtual void SystemResumed(const base::TimeDelta& sleep_duration) {}
-
-    // Called when the idle action will be performed soon.
-    virtual void IdleActionImminent() {}
+    // Called when the idle action will be performed after
+    // |time_until_idle_action|.
+    virtual void IdleActionImminent(
+        const base::TimeDelta& time_until_idle_action) {}
 
     // Called after IdleActionImminent() when the inactivity timer is reset
     // before the idle action has been performed.
     virtual void IdleActionDeferred() {}
   };
 
   // Adds and removes the observer.
   virtual void AddObserver(Observer* observer) = 0;
   virtual void RemoveObserver(Observer* observer) = 0;
   virtual bool HasObserver(Observer* observer) = 0;
@@ skipping 64 matching lines @@
   // Create() should be used instead.
   PowerManagerClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PowerManagerClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_