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

Unified Diff: chrome/browser/idle_linux.cc

Issue 7945014: Applied review comments from oshima for CL 7850026. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 3 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
Index: chrome/browser/idle_linux.cc
diff --git a/chrome/browser/idle_linux.cc b/chrome/browser/idle_linux.cc
index b04427e922e2335e4c25b351e743d4ce0c4b33f2..0b0da1c95ec47080adfd27a874c57d8afb6e6a88 100644
--- a/chrome/browser/idle_linux.cc
+++ b/chrome/browser/idle_linux.cc
@@ -6,7 +6,10 @@
#include "base/basictypes.h"
#include "chrome/browser/idle_query_linux.h"
+
+#if !defined(USE_AURA)
#include "chrome/browser/screensaver_window_finder_linux.h"
+#endif
void CalculateIdleState(unsigned int idle_threshold, IdleCallback notify) {
if (CheckIdleStateIsLocked()) {
@@ -22,7 +25,12 @@ void CalculateIdleState(unsigned int idle_threshold, IdleCallback notify) {
}
bool CheckIdleStateIsLocked() {
+#if defined(USE_AURA)
+ // TODO(saintlou): We have no Screensaver in Aura.
oshima 2011/09/19 22:31:03 we will have, just different implementation. We ju
Emmanuel Saint-loubert-Bié 2011/09/19 23:26:02 Done.
+ return false;
+#else
// Usually the screensaver is used to lock the screen, so we do not need to
// check if the workstation is locked.
return ScreensaverWindowFinder::ScreensaverWindowExists();
+#endif
}

Powered by Google App Engine
This is Rietveld 408576698