| Index: chrome/browser/android/signin/signin_manager_android.h
|
| diff --git a/chrome/browser/android/signin/signin_manager_android.h b/chrome/browser/android/signin/signin_manager_android.h
|
| index 1d9c1528edb6bb8a16e19dedf619eddf28c3b48c..6a414e77280898eed78bd41fbd08eef62f4273aa 100644
|
| --- a/chrome/browser/android/signin/signin_manager_android.h
|
| +++ b/chrome/browser/android/signin/signin_manager_android.h
|
| @@ -13,9 +13,7 @@
|
| #include "base/android/scoped_java_ref.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "base/threading/thread_checker.h"
|
| #include "components/prefs/pref_change_registrar.h"
|
| -#include "components/signin/core/browser/signin_manager_base.h"
|
|
|
| class Profile;
|
|
|
| @@ -31,7 +29,7 @@
|
| //
|
| // This class implements parts of the sign-in flow, to make sure that policy
|
| // is available before sign-in completes.
|
| -class SigninManagerAndroid : public SigninManagerBase::Observer {
|
| +class SigninManagerAndroid {
|
| public:
|
| SigninManagerAndroid(JNIEnv* env, jobject obj);
|
|
|
| @@ -78,16 +76,8 @@
|
| jboolean IsSignedInOnNative(JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj);
|
|
|
| - // SigninManagerBase::Observer implementation.
|
| - void GoogleSigninFailed(const GoogleServiceAuthError& error) override;
|
| - void GoogleSigninSucceeded(const std::string& account_id,
|
| - const std::string& username,
|
| - const std::string& password) override;
|
| - void GoogleSignedOut(const std::string& account_id,
|
| - const std::string& username) override;
|
| -
|
| private:
|
| - ~SigninManagerAndroid() override;
|
| + ~SigninManagerAndroid();
|
|
|
| void OnPolicyRegisterDone(const std::string& dm_token,
|
| const std::string& client_id);
|
| @@ -116,8 +106,6 @@
|
|
|
| PrefChangeRegistrar pref_change_registrar_;
|
|
|
| - base::ThreadChecker thread_checker_;
|
| -
|
| base::WeakPtrFactory<SigninManagerAndroid> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SigninManagerAndroid);
|
|
|