| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| index caf108a01949792c49e7fe699c5706d4b8f11695..f4ee2967a6be88622c5d383caf8070539796a943 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| @@ -110,9 +110,6 @@ const char kLoginURL[] = "chrome://oobe/login";
|
| // URL which corresponds to the OOBE WebUI.
|
| const char kOobeURL[] = "chrome://oobe/oobe";
|
|
|
| -// URL which corresponds to the new implementation of OOBE WebUI.
|
| -const char kNewOobeURL[] = "chrome://oobe-md/";
|
| -
|
| // URL which corresponds to the user adding WebUI.
|
| const char kUserAddingURL[] = "chrome://oobe/user-adding";
|
|
|
| @@ -274,7 +271,6 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
|
| startup_sound_played_(false),
|
| startup_sound_honors_spoken_feedback_(false),
|
| is_observing_keyboard_(false),
|
| - is_new_oobe_(false),
|
| pointer_factory_(this),
|
| animation_weak_ptr_factory_(this) {
|
| DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
|
| @@ -501,10 +497,8 @@ void LoginDisplayHostImpl::StartWizard(const std::string& first_screen_name) {
|
| }
|
| VLOG(1) << "Login WebUI >> wizard";
|
|
|
| - if (!login_window_) {
|
| - is_new_oobe_ = StartupUtils::IsNewOobeActivated();
|
| - LoadURL(is_new_oobe_ ? GURL(kNewOobeURL) : GURL(kOobeURL));
|
| - }
|
| + if (!login_window_)
|
| + LoadURL(GURL(kOobeURL));
|
|
|
| DVLOG(1) << "Starting wizard, first_screen_name: " << first_screen_name;
|
| // Create and show the wizard.
|
| @@ -514,9 +508,6 @@ void LoginDisplayHostImpl::StartWizard(const std::string& first_screen_name) {
|
| wizard_controller_.reset();
|
| wizard_controller_.reset(CreateWizardController());
|
|
|
| - if (is_new_oobe_)
|
| - return;
|
| -
|
| oobe_progress_bar_visible_ = !StartupUtils::IsDeviceRegistered();
|
| SetOobeProgressBarVisible(oobe_progress_bar_visible_);
|
| wizard_controller_->Init(first_screen_name);
|
|
|