| Index: chrome/browser/chromeos/login/login_performer.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/login/login_performer.cc (revision 95419)
|
| +++ chrome/browser/chromeos/login/login_performer.cc (working copy)
|
| @@ -50,8 +50,11 @@
|
| screen_lock_requested_(false),
|
| initial_online_auth_pending_(false),
|
| auth_mode_(AUTH_MODE_INTERNAL),
|
| - using_oauth_(CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kWebUIGaiaLogin)),
|
| + using_oauth_(
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kWebUIGaiaLogin) &&
|
| + !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kSkipOAuthLogin)),
|
| method_factory_(this) {
|
| DCHECK(default_performer_ == NULL)
|
| << "LoginPerformer should have only one instance.";
|
|
|