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

Side by Side Diff: chrome/browser/sync/profile_sync_service_android.h

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_ 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_ 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <map> 9 #include <map>
10 10
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 // Returns sync internals in a JSON-formatted Java string. 175 // Returns sync internals in a JSON-formatted Java string.
176 base::android::ScopedJavaLocalRef<jstring> GetAboutInfoForTest(JNIEnv* env, 176 base::android::ScopedJavaLocalRef<jstring> GetAboutInfoForTest(JNIEnv* env,
177 jobject obj); 177 jobject obj);
178 178
179 // Returns the integer value corresponding to the current auth error state 179 // Returns the integer value corresponding to the current auth error state
180 // (GoogleServiceAuthError.State). 180 // (GoogleServiceAuthError.State).
181 jint GetAuthError(JNIEnv* env, jobject obj); 181 jint GetAuthError(JNIEnv* env, jobject obj);
182 182
183 // ProfileSyncServiceObserver: 183 // ProfileSyncServiceObserver:
184 virtual void OnStateChanged() OVERRIDE; 184 virtual void OnStateChanged() override;
185 185
186 // Returns a timestamp for when a sync was last executed. The return value is 186 // Returns a timestamp for when a sync was last executed. The return value is
187 // the internal value of base::Time. 187 // the internal value of base::Time.
188 jlong GetLastSyncedTimeForTest(JNIEnv* env, jobject obj); 188 jlong GetLastSyncedTimeForTest(JNIEnv* env, jobject obj);
189 189
190 // Overrides ProfileSyncService's NetworkResources object. This is used to 190 // Overrides ProfileSyncService's NetworkResources object. This is used to
191 // set up the Sync FakeServer for testing. 191 // set up the Sync FakeServer for testing.
192 void OverrideNetworkResourcesForTest(JNIEnv* env, 192 void OverrideNetworkResourcesForTest(JNIEnv* env,
193 jobject obj, 193 jobject obj,
194 jlong network_resources); 194 jlong network_resources);
(...skipping 26 matching lines...) Expand all
221 // preferences. 221 // preferences.
222 scoped_ptr<sync_driver::SyncPrefs> sync_prefs_; 222 scoped_ptr<sync_driver::SyncPrefs> sync_prefs_;
223 223
224 // Java-side ProfileSyncService object. 224 // Java-side ProfileSyncService object.
225 JavaObjectWeakGlobalRef weak_java_profile_sync_service_; 225 JavaObjectWeakGlobalRef weak_java_profile_sync_service_;
226 226
227 DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceAndroid); 227 DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceAndroid);
228 }; 228 };
229 229
230 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_ 230 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/profile_sync_service_android_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698