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

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

Issue 33173005: Correctly deal with tokens for supervised users in ProfileOAuth2TokenService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_H_ 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 29 matching lines...) Expand all
40 #include "google_apis/gaia/oauth2_token_service.h" 40 #include "google_apis/gaia/oauth2_token_service.h"
41 #include "net/base/backoff_entry.h" 41 #include "net/base/backoff_entry.h"
42 #include "sync/internal_api/public/base/model_type.h" 42 #include "sync/internal_api/public/base/model_type.h"
43 #include "sync/internal_api/public/engine/model_safe_worker.h" 43 #include "sync/internal_api/public/engine/model_safe_worker.h"
44 #include "sync/internal_api/public/sync_manager_factory.h" 44 #include "sync/internal_api/public/sync_manager_factory.h"
45 #include "sync/internal_api/public/util/experiments.h" 45 #include "sync/internal_api/public/util/experiments.h"
46 #include "sync/internal_api/public/util/unrecoverable_error_handler.h" 46 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
47 #include "sync/js/sync_js_controller.h" 47 #include "sync/js/sync_js_controller.h"
48 #include "url/gurl.h" 48 #include "url/gurl.h"
49 49
50 class Profile;
50 class ProfileOAuth2TokenService; 51 class ProfileOAuth2TokenService;
51 class Profile;
52 class ProfileSyncComponentsFactory; 52 class ProfileSyncComponentsFactory;
53 class SigninManagerBase; 53 class SigninManagerBase;
54 class SyncGlobalError; 54 class SyncGlobalError;
55 55
56 namespace browser_sync { 56 namespace browser_sync {
57 class BackendMigrator; 57 class BackendMigrator;
58 class ChangeProcessor; 58 class ChangeProcessor;
59 class DataTypeManager; 59 class DataTypeManager;
60 class DeviceInfo; 60 class DeviceInfo;
61 class JsController; 61 class JsController;
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 // Sync.UnrecoverableErrors histogram. 815 // Sync.UnrecoverableErrors histogram.
816 void OnInternalUnrecoverableError(const tracked_objects::Location& from_here, 816 void OnInternalUnrecoverableError(const tracked_objects::Location& from_here,
817 const std::string& message, 817 const std::string& message,
818 bool delete_sync_database, 818 bool delete_sync_database,
819 UnrecoverableErrorReason reason); 819 UnrecoverableErrorReason reason);
820 820
821 // Returns the username (in form of an email address) that should be used in 821 // Returns the username (in form of an email address) that should be used in
822 // the credentials. 822 // the credentials.
823 std::string GetEffectiveUsername(); 823 std::string GetEffectiveUsername();
824 824
825 // Returns the account ID to use to get tokens.
826 std::string GetAccountIdToUse();
827
825 // Factory used to create various dependent objects. 828 // Factory used to create various dependent objects.
826 scoped_ptr<ProfileSyncComponentsFactory> factory_; 829 scoped_ptr<ProfileSyncComponentsFactory> factory_;
827 830
828 // The profile whose data we are synchronizing. 831 // The profile whose data we are synchronizing.
829 Profile* profile_; 832 Profile* profile_;
830 833
831 // The class that handles getting, setting, and persisting sync 834 // The class that handles getting, setting, and persisting sync
832 // preferences. 835 // preferences.
833 browser_sync::SyncPrefs sync_prefs_; 836 browser_sync::SyncPrefs sync_prefs_;
834 837
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 base::WeakPtrFactory<ProfileSyncService> weak_factory_; 977 base::WeakPtrFactory<ProfileSyncService> weak_factory_;
975 978
976 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 979 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
977 }; 980 };
978 981
979 bool ShouldShowActionOnUI( 982 bool ShouldShowActionOnUI(
980 const syncer::SyncProtocolError& error); 983 const syncer::SyncProtocolError& error);
981 984
982 985
983 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 986 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/signin/profile_oauth2_token_service.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698