| 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 6aeb354789f344bf4159470a729662f4cc86afdc..a10925176bb3a1bc09b63d23d13306b0da3b7668 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -11,6 +11,7 @@
|
| #include "base/memory/ref_counted_memory.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/browser_about_handler.h"
|
| +#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
|
| #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h"
|
| #include "chrome/browser/chromeos/login/screen_locker.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| @@ -90,7 +91,9 @@ void OobeUIHTMLSource::StartDataRequest(const std::string& path,
|
| }
|
|
|
| std::string response;
|
| - if (path.empty())
|
| + if (chromeos::KioskModeHelper::Get()->IsKioskModeEnabled())
|
| + response = GetDataResource(IDR_DEMO_USER_LOGIN_HTML);
|
| + else if (path.empty())
|
| response = GetDataResource(IDR_OOBE_HTML);
|
| else if (path == kLoginPath)
|
| response = GetDataResource(IDR_LOGIN_HTML);
|
|
|