Chromium Code Reviews| 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 544 // management. If so, the user is not allowed to configure sync. | 544 // management. If so, the user is not allowed to configure sync. |
| 545 virtual bool IsManaged() const; | 545 virtual bool IsManaged() const; |
| 546 | 546 |
| 547 // syncer::UnrecoverableErrorHandler implementation. | 547 // syncer::UnrecoverableErrorHandler implementation. |
| 548 virtual void OnUnrecoverableError( | 548 virtual void OnUnrecoverableError( |
| 549 const tracked_objects::Location& from_here, | 549 const tracked_objects::Location& from_here, |
| 550 const std::string& message) OVERRIDE; | 550 const std::string& message) OVERRIDE; |
| 551 | 551 |
| 552 // Called when a datatype wishes to disable itself. Note, this does not change | 552 // Called when a datatype wishes to disable itself. Note, this does not change |
| 553 // preferred state of a datatype and is not persisted across restarts. | 553 // preferred state of a datatype and is not persisted across restarts. |
| 554 virtual void DisableDatatype(syncer::ModelType type, | 554 virtual void DisableDatatype(syncer::ModelType type, |
|
Nicolas Zea
2014/07/16 21:18:30
given that SyncError already contains the type, I
stanisc
2014/07/18 01:36:47
Done.
| |
| 555 const tracked_objects::Location& from_here, | 555 const syncer::SyncError& error); |
| 556 std::string message); | |
| 557 | 556 |
| 558 // Called to re-enable a type disabled by DisableDatatype(..). Note, this does | 557 // Called to re-enable a type disabled by DisableDatatype(..). Note, this does |
| 559 // not change the preferred state of a datatype, and is not persisted across | 558 // not change the preferred state of a datatype, and is not persisted across |
| 560 // restarts. | 559 // restarts. |
| 561 void ReenableDatatype(syncer::ModelType type); | 560 void ReenableDatatype(syncer::ModelType type); |
| 562 | 561 |
| 563 // The functions below (until ActivateDataType()) should only be | 562 // The functions below (until ActivateDataType()) should only be |
| 564 // called if sync_initialized() is true. | 563 // called if sync_initialized() is true. |
| 565 | 564 |
| 566 // TODO(akalin): This is called mostly by ModelAssociators and | 565 // TODO(akalin): This is called mostly by ModelAssociators and |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1125 base::Callback<void(Profile*, base::Time, base::Time)> clear_browsing_data_; | 1124 base::Callback<void(Profile*, base::Time, base::Time)> clear_browsing_data_; |
| 1126 | 1125 |
| 1127 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 1126 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 1128 }; | 1127 }; |
| 1129 | 1128 |
| 1130 bool ShouldShowActionOnUI( | 1129 bool ShouldShowActionOnUI( |
| 1131 const syncer::SyncProtocolError& error); | 1130 const syncer::SyncProtocolError& error); |
| 1132 | 1131 |
| 1133 | 1132 |
| 1134 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 1133 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |