| OLD | NEW |
| 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 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 865 void RefreshSpareBootstrapToken(const std::string& passphrase); | 865 void RefreshSpareBootstrapToken(const std::string& passphrase); |
| 866 #endif | 866 #endif |
| 867 | 867 |
| 868 // Internal unrecoverable error handler. Used to track error reason via | 868 // Internal unrecoverable error handler. Used to track error reason via |
| 869 // Sync.UnrecoverableErrors histogram. | 869 // Sync.UnrecoverableErrors histogram. |
| 870 void OnInternalUnrecoverableError(const tracked_objects::Location& from_here, | 870 void OnInternalUnrecoverableError(const tracked_objects::Location& from_here, |
| 871 const std::string& message, | 871 const std::string& message, |
| 872 bool delete_sync_database, | 872 bool delete_sync_database, |
| 873 UnrecoverableErrorReason reason); | 873 UnrecoverableErrorReason reason); |
| 874 | 874 |
| 875 bool IsSessionsDataTypeControllerRunning() const; |
| 876 |
| 875 // Returns the username (in form of an email address) that should be used in | 877 // Returns the username (in form of an email address) that should be used in |
| 876 // the credentials. | 878 // the credentials. |
| 877 std::string GetEffectiveUsername(); | 879 std::string GetEffectiveUsername(); |
| 878 | 880 |
| 879 // Returns the account ID to use to get tokens. | 881 // Returns the account ID to use to get tokens. |
| 880 std::string GetAccountIdToUse(); | 882 std::string GetAccountIdToUse(); |
| 881 | 883 |
| 882 // Factory used to create various dependent objects. | 884 // Factory used to create various dependent objects. |
| 883 scoped_ptr<ProfileSyncComponentsFactory> factory_; | 885 scoped_ptr<ProfileSyncComponentsFactory> factory_; |
| 884 | 886 |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1041 scoped_ptr<SessionsSyncManager> sessions_sync_manager_; | 1043 scoped_ptr<SessionsSyncManager> sessions_sync_manager_; |
| 1042 | 1044 |
| 1043 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 1045 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 1044 }; | 1046 }; |
| 1045 | 1047 |
| 1046 bool ShouldShowActionOnUI( | 1048 bool ShouldShowActionOnUI( |
| 1047 const syncer::SyncProtocolError& error); | 1049 const syncer::SyncProtocolError& error); |
| 1048 | 1050 |
| 1049 | 1051 |
| 1050 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 1052 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |