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

Unified Diff: chrome/browser/android/signin/signin_manager_android.h

Issue 1786263002: Remove uses of ENABLE_CONFIGURATION_POLICY from src/chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sort Created 4 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/android/signin/signin_manager_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « no previous file | chrome/browser/android/signin/signin_manager_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698