Merge 203774 "chromeos: Add delay between screen off and lock."

chromeos/dbus/power_policy_controller.h

 // Copyright (c) 2013 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_POLICY_CONTROLLER_H_
 #define CHROMEOS_DBUS_POWER_POLICY_CONTROLLER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 43 matching lines @@
     bool allow_screen_wake_locks;
     bool enable_screen_lock;
     double presentation_idle_delay_factor;
     double user_activity_screen_dim_delay_factor;
   };
 
   // Returns a string describing |policy|.  Useful for tests.
   static std::string GetPolicyDebugString(
       const power_manager::PowerManagementPolicy& policy);
 
+  // Delay in milliseconds between the screen being turned off and the
+  // screen being locked. Used if the |enable_screen_lock| pref is set but
+  // |*_screen_lock_delay_ms| are unset or set to higher values than what
+  // this constant would imply.
+  const static int kScreenLockAfterOffDelayMs;
+
   PowerPolicyController(DBusThreadManager* manager, PowerManagerClient* client);
   virtual ~PowerPolicyController();
 
   // Updates |prefs_policy_| with |values| and sends an updated policy.
   void ApplyPrefs(const PrefValues& values);
 
   // Registers a request to temporarily prevent the screen from getting
   // dimmed or turned off or the system from suspending in response to user
   // inactivity and sends an updated policy.  |reason| is a human-readable
   // description of the reason the lock was created.  Returns a unique ID
@@ skipping 42 matching lines @@
 
   // Next ID to be used by AddScreenWakeLock() or AddSystemWakeLock().
   int next_wake_lock_id_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPolicyController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_POWER_POLICY_CONTROLLER_H_