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

Side by Side Diff: chrome/browser/android/signin/signin_manager_android.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_ANDROID_SIGNIN_SIGNIN_MANAGER_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_SIGNIN_SIGNIN_MANAGER_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_SIGNIN_SIGNIN_MANAGER_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_SIGNIN_SIGNIN_MANAGER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 void OnBrowsingDataRemoverDone(); 69 void OnBrowsingDataRemoverDone();
70 70
71 void ClearLastSignedInUser(); 71 void ClearLastSignedInUser();
72 72
73 void OnSigninAllowedPrefChanged(); 73 void OnSigninAllowedPrefChanged();
74 74
75 // MergeSessionHelper::Observer implementation. 75 // MergeSessionHelper::Observer implementation.
76 virtual void MergeSessionCompleted( 76 virtual void MergeSessionCompleted(
77 const std::string& account_id, 77 const std::string& account_id,
78 const GoogleServiceAuthError& error) OVERRIDE; 78 const GoogleServiceAuthError& error) override;
79 79
80 Profile* profile_; 80 Profile* profile_;
81 81
82 // Java-side SigninManager object. 82 // Java-side SigninManager object.
83 base::android::ScopedJavaGlobalRef<jobject> java_signin_manager_; 83 base::android::ScopedJavaGlobalRef<jobject> java_signin_manager_;
84 84
85 #if defined(ENABLE_CONFIGURATION_POLICY) 85 #if defined(ENABLE_CONFIGURATION_POLICY)
86 // CloudPolicy credentials stored during a pending sign-in, awaiting user 86 // CloudPolicy credentials stored during a pending sign-in, awaiting user
87 // confirmation before starting to fetch policies. 87 // confirmation before starting to fetch policies.
88 std::string dm_token_; 88 std::string dm_token_;
89 std::string client_id_; 89 std::string client_id_;
90 90
91 // Username that is pending sign-in. This is used to extract the domain name 91 // Username that is pending sign-in. This is used to extract the domain name
92 // for the policy dialog, when |username_| corresponds to a managed account. 92 // for the policy dialog, when |username_| corresponds to a managed account.
93 std::string username_; 93 std::string username_;
94 #endif 94 #endif
95 95
96 // Helper to merge the signed into account into the cookie jar session. 96 // Helper to merge the signed into account into the cookie jar session.
97 scoped_ptr<MergeSessionHelper> merge_session_helper_; 97 scoped_ptr<MergeSessionHelper> merge_session_helper_;
98 98
99 PrefChangeRegistrar pref_change_registrar_; 99 PrefChangeRegistrar pref_change_registrar_;
100 100
101 base::WeakPtrFactory<SigninManagerAndroid> weak_factory_; 101 base::WeakPtrFactory<SigninManagerAndroid> weak_factory_;
102 102
103 DISALLOW_COPY_AND_ASSIGN(SigninManagerAndroid); 103 DISALLOW_COPY_AND_ASSIGN(SigninManagerAndroid);
104 }; 104 };
105 105
106 #endif // CHROME_BROWSER_ANDROID_SIGNIN_SIGNIN_MANAGER_ANDROID_H_ 106 #endif // CHROME_BROWSER_ANDROID_SIGNIN_SIGNIN_MANAGER_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/shortcut_helper_unittest.cc ('k') | chrome/browser/android/signin/signin_manager_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698