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

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 10928088: Factory reset screen is added (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed formatting Created 8 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
Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index ce05e1c087580a5f3dae7d9a15f2c6a1cc8a62d7..9c2d8dc750a7c8780b5e677fa90008ece69286f7 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -26,6 +26,7 @@
#include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
@@ -124,6 +125,7 @@ OobeUI::OobeUI(content::WebUI* web_ui)
update_screen_actor_(NULL),
network_screen_actor_(NULL),
eula_screen_actor_(NULL),
+ reset_screen_actor_(NULL),
signin_screen_handler_(NULL),
user_image_screen_actor_(NULL) {
core_handler_ = new CoreOobeHandler(this);
@@ -139,6 +141,10 @@ OobeUI::OobeUI(content::WebUI* web_ui)
eula_screen_actor_ = eula_screen_handler;
AddScreenHandler(eula_screen_handler);
+ ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
+ reset_screen_actor_ = reset_screen_handler;
+ AddScreenHandler(reset_screen_handler);
+
UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler();
update_screen_actor_ = update_screen_handler;
AddScreenHandler(update_screen_handler);
@@ -216,6 +222,10 @@ EnterpriseEnrollmentScreenActor* OobeUI::
return enterprise_enrollment_screen_actor_;
}
+ResetScreenActor* OobeUI::GetResetScreenActor() {
+ return reset_screen_actor_;
+}
+
UserImageScreenActor* OobeUI::GetUserImageScreenActor() {
return user_image_screen_actor_;
}
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698