| 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 cc0b3be8b91b52717f2d5570fa0222dcdc3a756d..488031a4115a7a2528542591822756d4575f6716 100644
|
| --- a/chrome/browser/android/signin/signin_manager_android.h
|
| +++ b/chrome/browser/android/signin/signin_manager_android.h
|
| @@ -79,11 +79,9 @@ class SigninManagerAndroid {
|
| private:
|
| ~SigninManagerAndroid();
|
|
|
| -#if defined(ENABLE_CONFIGURATION_POLICY)
|
| void OnPolicyRegisterDone(const std::string& dm_token,
|
| const std::string& client_id);
|
| void OnPolicyFetchDone(bool success);
|
| -#endif
|
|
|
| void OnBrowsingDataRemoverDone(
|
| const base::android::ScopedJavaGlobalRef<jobject>& callback);
|
| @@ -97,7 +95,6 @@ class SigninManagerAndroid {
|
| // Java-side SigninManager object.
|
| base::android::ScopedJavaGlobalRef<jobject> java_signin_manager_;
|
|
|
| -#if defined(ENABLE_CONFIGURATION_POLICY)
|
| // CloudPolicy credentials stored during a pending sign-in, awaiting user
|
| // confirmation before starting to fetch policies.
|
| std::string dm_token_;
|
| @@ -106,7 +103,6 @@ class SigninManagerAndroid {
|
| // Username that is pending sign-in. This is used to extract the domain name
|
| // for the policy dialog, when |username_| corresponds to a managed account.
|
| std::string username_;
|
| -#endif
|
|
|
| PrefChangeRegistrar pref_change_registrar_;
|
|
|
|
|