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

Unified Diff: chrome/browser/idle_chromeos.cc

Issue 852453005: chromeos: Make CheckIdleStateIsLocked() query D-Bus client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sigh, MockSessionManagerClient Created 5 years, 11 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_chromeos.cc
diff --git a/chrome/browser/idle_chromeos.cc b/chrome/browser/idle_chromeos.cc
index 9505d05cb618be80e0f9897fe33baa3730dcaf2e..7c289a7ae0c515639f9da1883fe1d2d2d71efe46 100644
--- a/chrome/browser/idle_chromeos.cc
+++ b/chrome/browser/idle_chromeos.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/idle.h"
-#include "ash/session/session_state_delegate.h"
-#include "ash/shell.h"
#include "base/time/time.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
#include "ui/base/user_activity/user_activity_detector.h"
void CalculateIdleTime(IdleTimeCallback notify) {
@@ -16,9 +16,6 @@ void CalculateIdleTime(IdleTimeCallback notify) {
}
bool CheckIdleStateIsLocked() {
-#if defined(USE_ATHENA)
- return false;
-#else
- return ash::Shell::GetInstance()->session_state_delegate()->IsScreenLocked();
-#endif
+ return chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
+ IsScreenLocked();
}
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.cc ('k') | chromeos/dbus/fake_session_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698