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

Unified Diff: chrome/browser/signin/easy_unlock_service_regular.h

Issue 668213003: Reauthenticate the user before launching Smart Lock setup app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/signin/easy_unlock_service_regular.h
diff --git a/chrome/browser/signin/easy_unlock_service_regular.h b/chrome/browser/signin/easy_unlock_service_regular.h
index 768d1fd13b86b93cc4581ca29637d19f09dc81d8..a496b2f3a2289e94f48e2d25ca13f25da5eac81d 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.h
+++ b/chrome/browser/signin/easy_unlock_service_regular.h
@@ -12,6 +12,10 @@
#include "base/prefs/pref_change_registrar.h"
#include "chrome/browser/signin/easy_unlock_service.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h"
+#endif
+
namespace base {
class DictionaryValue;
class ListValue;
@@ -47,6 +51,9 @@ class EasyUnlockServiceRegular : public EasyUnlockService {
virtual void ShutdownInternal() override;
virtual bool IsAllowedInternal() override;
+ // Opens the component packaged app responsible for setting up Smart Lock.
+ void OpenSetupApp();
+
// Callback when the controlling pref changes.
void OnPrefsChanged();
@@ -56,11 +63,20 @@ class EasyUnlockServiceRegular : public EasyUnlockService {
// Callback invoked when turn off flow has finished.
void OnTurnOffFlowFinished(bool success);
+#if defined(OS_CHROMEOS)
+ void OnUserContextFromReauth(const chromeos::UserContext& user_context);
+ void OnKeysRefreshedForSetDevices(bool success);
+
+ scoped_ptr<chromeos::ShortLivedUserContext> short_lived_user_context_;
+#endif
+
PrefChangeRegistrar registrar_;
TurnOffFlowStatus turn_off_flow_status_;
scoped_ptr<EasyUnlockToggleFlow> turn_off_flow_;
+ base::WeakPtrFactory<EasyUnlockServiceRegular> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceRegular);
};

Powered by Google App Engine
This is Rietveld 408576698