Index: chrome/browser/chromeos/login/login_performer.h |
diff --git a/chrome/browser/chromeos/login/login_performer.h b/chrome/browser/chromeos/login/login_performer.h |
index 4524ea65da2ff9c23f4a02dbb9a168c4bc75cd46..bf2fad34ef5e8bae093fa025ca5e63189cd16bd5 100644 |
--- a/chrome/browser/chromeos/login/login_performer.h |
+++ b/chrome/browser/chromeos/login/login_performer.h |
@@ -10,10 +10,10 @@ |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
+#include "base/memory/weak_ptr.h" |
#include "base/task.h" |
#include "chrome/browser/chromeos/login/authenticator.h" |
#include "chrome/browser/chromeos/login/login_status_consumer.h" |
-#include "chrome/browser/chromeos/login/signed_settings_helper.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/common/net/gaia/google_service_auth_error.h" |
#include "content/common/notification_observer.h" |
@@ -52,7 +52,6 @@ namespace chromeos { |
// 1. ScreenLock active (pending correct new password input) |
// 2. Pending online auth request. |
class LoginPerformer : public LoginStatusConsumer, |
- public SignedSettingsHelper::Callback, |
public NotificationObserver, |
public ProfileManagerObserver { |
public: |
@@ -128,10 +127,6 @@ class LoginPerformer : public LoginStatusConsumer, |
const NotificationSource& source, |
const NotificationDetails& details) OVERRIDE; |
- // SignedSettingsHelper::Callback implementation: |
- virtual void OnCheckWhitelistCompleted(SignedSettings::ReturnCode code, |
- const std::string& email) OVERRIDE; |
- |
// ProfileManagerObserver implementation: |
virtual void OnProfileCreated(Profile* profile, Status status) OVERRIDE; |
@@ -212,7 +207,7 @@ class LoginPerformer : public LoginStatusConsumer, |
// True if we use OAuth during authorization process. |
bool using_oauth_; |
- ScopedRunnableMethodFactory<LoginPerformer> method_factory_; |
+ base::WeakPtrFactory<LoginPerformer> pointer_factory_; |
DISALLOW_COPY_AND_ASSIGN(LoginPerformer); |
}; |