diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 02:40:09 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 02:40:09 +0000 |
| commit | 6405a9a2c316766d3fbda622fbf8bfe33e402c28 (patch) | |
| tree | f5282e1e7e1e2cac053f9f4f4dc6d2436900e5a4 /chrome/browser/idle_android.cc | |
| parent | b6b9b4ec85ba5dee24bf190adec3338a67f54e0e (diff) | |
| download | chromium_src-6405a9a2c316766d3fbda622fbf8bfe33e402c28.zip chromium_src-6405a9a2c316766d3fbda622fbf8bfe33e402c28.tar.gz chromium_src-6405a9a2c316766d3fbda622fbf8bfe33e402c28.tar.bz2 | |
Revert 168104 because it broke interactive_ui_tests and browser_tests on debug builds.
===
1) added "idle" and "locked" transitions to idle.onStateChanged
2) Per-app/extension idle threshold, settable via idle.setDetectionInterval
3) Bug fixes
BUG=143275
Review URL: https://chromiumcodereview.appspot.com/10985056
TBR=courage@chromium.org
Review URL: https://codereview.chromium.org/11418024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/idle_android.cc')
| -rw-r--r-- | chrome/browser/idle_android.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/idle_android.cc b/chrome/browser/idle_android.cc index 9d4fa2c..7cf1969 100644 --- a/chrome/browser/idle_android.cc +++ b/chrome/browser/idle_android.cc @@ -10,12 +10,7 @@ // constrained devices such as Android we'll often get completely killed if // Chrome isn't active anyway. // TODO(yfriedman): Tracking in bug: 114481 -void CalculateIdleTime(IdleTimeCallback notify) { +void CalculateIdleState(unsigned int idle_threshold, IdleCallback notify) { NOTIMPLEMENTED(); - notify.Run(0); -} - -bool CheckIdleStateIsLocked() { - NOTIMPLEMENTED(); - return false; + notify.Run(IDLE_STATE_ACTIVE); } |