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

Unified Diff: chrome/browser/idle_chromeos.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
« no previous file with comments | « chrome/browser/chromeos/login/helper.cc ('k') | chrome/browser/idle_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/idle_chromeos.cc
diff --git a/chrome/browser/idle_chromeos.cc b/chrome/browser/idle_chromeos.cc
index e199ba224f8fd5d5b26e54c7e6a6edc9e2dcc707..cf762d77070de0d502d1a10190c0a8a589d983aa 100644
--- a/chrome/browser/idle_chromeos.cc
+++ b/chrome/browser/idle_chromeos.cc
@@ -8,7 +8,9 @@
#include "base/callback.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/power_library.h"
-#include "chrome/browser/screensaver_window_finder_linux.h"
+#if !defined(USE_AURA)
+#include "chrome/browser/screensaver_window_finder_gtk.h"
+#endif
void CalculateIdleStateNotifier(unsigned int idle_treshold,
IdleCallback notify,
@@ -37,5 +39,9 @@ void CalculateIdleState(unsigned int idle_threshold, IdleCallback notify) {
bool CheckIdleStateIsLocked() {
// Usually the screensaver is used to lock the screen, so we do not need to
// check if the workstation is locked.
+#if defined(USE_AURA)
+ return false;
+#else
return ScreensaverWindowFinder::ScreensaverWindowExists();
+#endif
}
« no previous file with comments | « chrome/browser/chromeos/login/helper.cc ('k') | chrome/browser/idle_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698