| 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 29c31434a3d2a6f19a611d927b6ec9ec89c4eaa5..1e441059574637e280055afe431673a57d77116d 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
|
| -#include "chrome/browser/ui/webui/chromeos/login/enterprise_enrollment_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
|
| @@ -28,7 +27,6 @@
|
| #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
|
| #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
|
| #include "chrome/browser/ui/webui/theme_source.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/jstemplate_builder.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
| @@ -129,19 +127,12 @@ OobeUI::OobeUI(TabContents* contents)
|
| update_screen_actor_ = update_screen_handler;
|
| AddScreenHandler(update_screen_handler);
|
|
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUILogin)) {
|
| - EnterpriseOAuthEnrollmentScreenHandler*
|
| - enterprise_oauth_enrollment_screen_handler =
|
| - new EnterpriseOAuthEnrollmentScreenHandler;
|
| - enterprise_enrollment_screen_actor_ =
|
| - enterprise_oauth_enrollment_screen_handler;
|
| - AddScreenHandler(enterprise_oauth_enrollment_screen_handler);
|
| - } else {
|
| - EnterpriseEnrollmentScreenHandler* enterprise_enrollment_screen_handler =
|
| - new EnterpriseEnrollmentScreenHandler;
|
| - enterprise_enrollment_screen_actor_ = enterprise_enrollment_screen_handler;
|
| - AddScreenHandler(enterprise_enrollment_screen_handler);
|
| - }
|
| + EnterpriseOAuthEnrollmentScreenHandler*
|
| + enterprise_oauth_enrollment_screen_handler =
|
| + new EnterpriseOAuthEnrollmentScreenHandler;
|
| + enterprise_enrollment_screen_actor_ =
|
| + enterprise_oauth_enrollment_screen_handler;
|
| + AddScreenHandler(enterprise_oauth_enrollment_screen_handler);
|
|
|
| UserImageScreenHandler* user_image_screen_handler =
|
| new UserImageScreenHandler();
|
|
|