| 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 7e843cc88403d2419e9ca40745ce30ea8cebd694..4cd04528a57abfe9d81930c823a036eec34d0ca3 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| @@ -110,7 +110,7 @@ const char kLoginURL[] = "chrome://oobe/login";
|
| const char kOobeURL[] = "chrome://oobe/oobe";
|
|
|
| // URL which corresponds to the new implementation of OOBE WebUI.
|
| -const char kNewOobeURL[] = "chrome://oobe/new-oobe";
|
| +const char kNewOobeURL[] = "chrome://oobe-md/";
|
|
|
| // URL which corresponds to the user adding WebUI.
|
| const char kUserAddingURL[] = "chrome://oobe/user-adding";
|
| @@ -273,6 +273,7 @@ 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);
|
| @@ -498,8 +499,8 @@ void LoginDisplayHostImpl::StartWizard(const std::string& first_screen_name) {
|
| VLOG(1) << "Login WebUI >> wizard";
|
|
|
| if (!login_window_) {
|
| - LoadURL(StartupUtils::IsNewOobeActivated() ? GURL(kNewOobeURL)
|
| - : GURL(kOobeURL));
|
| + is_new_oobe_ = StartupUtils::IsNewOobeActivated();
|
| + LoadURL(is_new_oobe_ ? GURL(kNewOobeURL) : GURL(kOobeURL));
|
| }
|
|
|
| DVLOG(1) << "Starting wizard, first_screen_name: " << first_screen_name;
|
| @@ -510,6 +511,9 @@ 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);
|
|
|