diff options
author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 16:00:27 +0000 |
---|---|---|
committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 16:00:27 +0000 |
commit | d411c01d6b59e90f82ab2f20aad81f240bba0bff (patch) | |
tree | a8f622608a5c56c380949a2ecf1cc2da1d00fd91 /chrome/common | |
parent | 11fe41a6b2cb4229f8ef3ff0bc22fd609fe838e4 (diff) | |
download | chromium_src-d411c01d6b59e90f82ab2f20aad81f240bba0bff.zip chromium_src-d411c01d6b59e90f82ab2f20aad81f240bba0bff.tar.gz chromium_src-d411c01d6b59e90f82ab2f20aad81f240bba0bff.tar.bz2 |
First iteration of a WebUI lock screen.
This version displays a simple interface that can unlock the screen with a password. Ultimately the UI will come from the login screen pages, however this is just a stand-in to get the backend functionality working. This is enabled with the flag --webui-lock-screen.
BUG=97980
TEST=Tested enabling flag and locking screen with WebUI lock screen.
Review URL: http://codereview.chromium.org/8171008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
-rw-r--r-- | chrome/common/url_constants.cc | 2 | ||||
-rw-r--r-- | chrome/common/url_constants.h | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 1cd7ffa..94fd516 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1058,6 +1058,9 @@ const char kVersion[] = "version"; const char kWinHttpProxyResolver[] = "winhttp-proxy-resolver"; #if defined(OS_CHROMEOS) +// Enable WebUI based lock screen. +const char kWebUILockScreen[] = "webui-lock-screen"; + // Enable WebUI based OOBE and login. const char kWebUILogin[] = "webui-login"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 0812fdb..453b166 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -290,6 +290,7 @@ extern const char kVersion[]; extern const char kWinHttpProxyResolver[]; #if defined(OS_CHROMEOS) +extern const char kWebUILockScreen[]; extern const char kWebUILogin[]; extern const char kSkipOAuthLogin[]; extern const char kEnableBluetooth[]; diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 87370e4..25206ff 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -80,6 +80,7 @@ const char kChromeUIEnterpriseEnrollmentURL[] = "chrome://enterprise-enrollment/"; const char kChromeUIImageBurnerURL[] = "chrome://imageburner/"; const char kChromeUIKeyboardOverlayURL[] = "chrome://keyboardoverlay/"; +const char kChromeUILockScreenURL[] = "chrome://lock/"; const char kChromeUIMediaplayerURL[] = "chrome://mediaplayer/"; const char kChromeUIMobileSetupURL[] = "chrome://mobilesetup/"; const char kChromeUIOSCreditsURL[] = "chrome://os-credits/"; @@ -192,6 +193,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIEnterpriseEnrollmentHost[] = "enterprise-enrollment"; const char kChromeUIImageBurnerHost[] = "imageburner"; const char kChromeUIKeyboardOverlayHost[] = "keyboardoverlay"; +const char kChromeUILockScreenHost[] = "lock"; const char kChromeUILoginContainerHost[] = "login-container"; const char kChromeUILoginHost[] = "login"; const char kChromeUIMediaplayerHost[] = "mediaplayer"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index a3c6a5d..bcea8f1 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -73,6 +73,7 @@ extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIEnterpriseEnrollmentURL[]; extern const char kChromeUIImageBurnerURL[]; extern const char kChromeUIKeyboardOverlayURL[]; +extern const char kChromeUILockScreenURL[]; extern const char kChromeUIMediaplayerURL[]; extern const char kChromeUIMobileSetupURL[]; extern const char kChromeUIOSCreditsURL[]; @@ -183,6 +184,7 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIEnterpriseEnrollmentHost[]; extern const char kChromeUIImageBurnerHost[]; extern const char kChromeUIKeyboardOverlayHost[]; +extern const char kChromeUILockScreenHost[]; extern const char kChromeUILoginContainerHost[]; extern const char kChromeUILoginHost[]; extern const char kChromeUIMediaplayerHost[]; |