summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 16:37:56 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 16:37:56 +0000
commit41238a2269b7e131b0cd342d1df65f3a2fa6b2b1 (patch)
treeb691ae8989c69dfe7c11fd9d22019895ced03149
parente2856caa303a30aa6ed062db1db50305ed6b14cb (diff)
downloadchromium_src-41238a2269b7e131b0cd342d1df65f3a2fa6b2b1.zip
chromium_src-41238a2269b7e131b0cd342d1df65f3a2fa6b2b1.tar.gz
chromium_src-41238a2269b7e131b0cd342d1df65f3a2fa6b2b1.tar.bz2
[cros] Restrict chrome://oobe to non-user session only.
Guest session is also considered a "user session". BUG=chromium-os:18259 TEST=Manual. Review URL: http://codereview.chromium.org/7966036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102506 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/webui/chromeos/login/oobe_ui.cc39
1 files changed, 22 insertions, 17 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index f35224d..01990c0 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -12,6 +12,7 @@
#include "base/values.h"
#include "chrome/browser/browser_about_handler.h"
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ -62,6 +63,8 @@ class OobeUIHTMLSource : public ChromeURLDataManager::DataSource {
private:
virtual ~OobeUIHTMLSource() {}
+ std::string GetDataResource(int resource_id) const;
+
scoped_ptr<DictionaryValue> localized_strings_;
DISALLOW_COPY_AND_ASSIGN(OobeUIHTMLSource);
};
@@ -76,28 +79,30 @@ OobeUIHTMLSource::OobeUIHTMLSource(DictionaryValue* localized_strings)
void OobeUIHTMLSource::StartDataRequest(const std::string& path,
bool is_incognito,
int request_id) {
- std::string response;
- if (path.empty()) {
- static const base::StringPiece html(
- ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_OOBE_HTML));
- response = jstemplate_builder::GetI18nTemplateHtml(
- html, localized_strings_.get());
- } else if (path == kLoginPath) {
- static const base::StringPiece html(
- ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_LOGIN_HTML));
- response = jstemplate_builder::GetI18nTemplateHtml(
- html, localized_strings_.get());
- } else if (path == kEnterpriseEnrollmentGaiaLoginPath) {
- static const base::StringPiece html(
- ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_GAIA_LOGIN_HTML));
- response = jstemplate_builder::GetI18nTemplateHtml(
- html, localized_strings_.get());
+ if (UserManager::Get()->user_is_logged_in()) {
+ scoped_refptr<RefCountedBytes> empty_bytes(new RefCountedBytes());
+ SendResponse(request_id, empty_bytes);
+ return;
}
+ std::string response;
+ if (path.empty())
+ response = GetDataResource(IDR_OOBE_HTML);
+ else if (path == kLoginPath)
+ response = GetDataResource(IDR_LOGIN_HTML);
+ else if (path == kEnterpriseEnrollmentGaiaLoginPath)
+ response = GetDataResource(IDR_GAIA_LOGIN_HTML);
+
SendResponse(request_id, base::RefCountedString::TakeString(&response));
}
+std::string OobeUIHTMLSource::GetDataResource(int resource_id) const {
+ const base::StringPiece html(
+ ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
+ return jstemplate_builder::GetI18nTemplateHtml(html,
+ localized_strings_.get());
+}
+
// OobeUI ----------------------------------------------------------------------
OobeUI::OobeUI(TabContents* contents)