Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1501)

Unified Diff: chrome/browser/chromeos/login/login_performer.cc

Issue 11649055: OAuth2 sign-in flow for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/login_performer.cc
diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc
index ca0a1ac9ffba64ef3e4cb1e1fcbc59bb4bdaad52..6902e48c841e878e17da5a334fc00594c57047b0 100644
--- a/chrome/browser/chromeos/login/login_performer.cc
+++ b/chrome/browser/chromeos/login/login_performer.cc
@@ -7,7 +7,6 @@
#include <string>
#include "base/bind.h"
-#include "base/command_line.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
@@ -25,7 +24,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/session_manager_client.h"
@@ -60,9 +58,6 @@ LoginPerformer::LoginPerformer(Delegate* delegate)
screen_lock_requested_(false),
initial_online_auth_pending_(false),
auth_mode_(AUTH_MODE_INTERNAL),
- using_oauth_(
- !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSkipOAuthLogin)),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
DCHECK(default_performer_ == NULL)
<< "LoginPerformer should have only one instance.";
@@ -190,8 +185,8 @@ void LoginPerformer::OnProfileCreated(
return;
}
- if (using_oauth_)
- LoginUtils::Get()->StartTokenServices(profile);
+ // TODO(zelidrag): Figure out when this needs to run.
+ LoginUtils::Get()->StartTokenServices(profile);
// Don't unlock screen if it was locked while we're waiting
// for initial online auth.

Powered by Google App Engine
This is Rietveld 408576698