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

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

Issue 491263002: UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 e357d79d6706771c30ba6b1161b2b041fa33a027..c2bd310f8883bdde4d97ce9917dfea88b45f0816 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/memory/ref_counted.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
#include "net/base/net_errors.h"
@@ -61,6 +62,7 @@ class GaiaScreenHandler : public BaseScreenHandler {
};
GaiaScreenHandler(
+ CoreOobeActor* core_oobe_actor,
const scoped_refptr<NetworkStateInformer>& network_state_informer,
policy::ConsumerManagementService* consumer_management);
virtual ~GaiaScreenHandler();
@@ -174,6 +176,8 @@ class GaiaScreenHandler : public BaseScreenHandler {
// Consumer management service for checking if enrollment is in progress.
policy::ConsumerManagementService* consumer_management_;
+ CoreOobeActor* core_oobe_actor_;
+
// Email to pre-populate with.
std::string populated_email_;

Powered by Google App Engine
This is Rietveld 408576698