diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 18:13:26 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 18:13:26 +0000 |
commit | 5101952f5cd5adeb5d1563c7506006a053e27346 (patch) | |
tree | 32135e58181cebf17bfd283cc4e10c27be67eeb8 /chrome/common | |
parent | 6478b07b32faa9bc2bf71ca52eaa774efecdb748 (diff) | |
download | chromium_src-5101952f5cd5adeb5d1563c7506006a053e27346.zip chromium_src-5101952f5cd5adeb5d1563c7506006a053e27346.tar.gz chromium_src-5101952f5cd5adeb5d1563c7506006a053e27346.tar.bz2 |
Added AuthenticateToUnlock which is to be used for screen lock.
* Renamed Authenticate to AuthenticateToLogin
* Removed obsolete PamGoogleAuthenticator and InChromeAuth option
* Changed ScreenLocker to use AuthenticatToUnlock
Other changes:
* Removed StubAuthenticator
* Removed Profile from ScreenLock as it's no longer necessary
* Moved MockAuthenticator to separate mock_authenticator file
* added mock files to gyp file.
BUG=http://crosbug.com/2914
TEST=none yet
test will be added along with cros library
Review URL: http://codereview.chromium.org/2032006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index b47fdef..f581635 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -819,10 +819,6 @@ const char kZygoteCmdPrefix[] = "zygote-cmd-prefix"; const char kZygoteProcess[] = "zygote"; #if defined(OS_CHROMEOS) -// The name of the pipe over which the Chrome OS login manager will send -// single-sign-on cookies. -const char kCookiePipe[] = "cookie-pipe"; - // Enables the chat manager component extension. const char kEnableChatManager[] = "enable-chat-manager"; @@ -835,8 +831,6 @@ const char kEnableLoginImages[] = "enable-login-images"; // Enable Chrome-as-a-login-manager behavior. const char kLoginManager[] = "login-manager"; -// Enable Chrome to do ClientLogin on its own in the login-manager context. -const char kInChromeAuth[] = "in-chrome-auth"; // Allows to override the first login screen. The value should be the name // of the first login screen to show (see // chrome/browser/chromeos/login/login_wizard_view.cc for actual names). diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index f0c4244..88c15fd 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -232,12 +232,10 @@ extern const char kZygoteCmdPrefix[]; extern const char kZygoteProcess[]; #if defined(OS_CHROMEOS) -extern const char kCookiePipe[]; extern const char kEnableChatManager[]; extern const char kEnableGView[]; extern const char kEnableLoginImages[]; extern const char kLoginManager[]; -extern const char kInChromeAuth[]; // TODO(avayvod): Remove this flag when it's unnecessary for testing // purposes. extern const char kLoginScreen[]; |