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

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

Issue 438493002: Added ConsumerManagementService class to handle enroll state and device owner info in boot lockbox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@signin
Patch Set: Fixed the broken test. Created 6 years, 4 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/ui/webui/chromeos/login/gaia_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
index ac9f391b93e7e461b1ae20d605ff3142d0f9ddc1..e357d79d6706771c30ba6b1161b2b041fa33a027 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
@@ -5,12 +5,18 @@
#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
+#include <string>
+
#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
#include "net/base/net_errors.h"
+namespace policy {
+class ConsumerManagementService;
+}
+
namespace chromeos {
class SigninScreenHandler;
@@ -54,8 +60,9 @@ class GaiaScreenHandler : public BaseScreenHandler {
FRAME_STATE_ERROR
};
- explicit GaiaScreenHandler(
- const scoped_refptr<NetworkStateInformer>& network_state_informer);
+ GaiaScreenHandler(
+ const scoped_refptr<NetworkStateInformer>& network_state_informer,
+ policy::ConsumerManagementService* consumer_management);
virtual ~GaiaScreenHandler();
void LoadGaia(const GaiaContext& context);
@@ -95,6 +102,17 @@ class GaiaScreenHandler : public BaseScreenHandler {
void HandleGaiaUIReady();
+ // This is called when ConsumerManagementService::SetOwner() returns.
+ void OnSetOwnerDone(const std::string& typed_email,
+ const std::string& password,
+ bool using_saml,
+ bool success);
+
+ // Really handles the complete login message.
+ void DoCompleteLogin(const std::string& typed_email,
+ const std::string& password,
+ bool using_saml);
+
// Fill GAIA user name.
void PopulateEmail(const std::string& user_id);
@@ -153,6 +171,9 @@ class GaiaScreenHandler : public BaseScreenHandler {
// Network state informer used to keep signin screen up.
scoped_refptr<NetworkStateInformer> network_state_informer_;
+ // Consumer management service for checking if enrollment is in progress.
+ policy::ConsumerManagementService* consumer_management_;
+
// Email to pre-populate with.
std::string populated_email_;

Powered by Google App Engine
This is Rietveld 408576698