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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <list> | 9 #include <list> |
10 #include <string> | 10 #include <string> |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
342 | 342 |
343 // Returns whether sync is managed, i.e. controlled by configuration | 343 // Returns whether sync is managed, i.e. controlled by configuration |
344 // management. If so, the user is not allowed to configure sync. | 344 // management. If so, the user is not allowed to configure sync. |
345 bool IsManaged() const; | 345 bool IsManaged() const; |
346 | 346 |
347 // UnrecoverableErrorHandler implementation. | 347 // UnrecoverableErrorHandler implementation. |
348 virtual void OnUnrecoverableError( | 348 virtual void OnUnrecoverableError( |
349 const tracked_objects::Location& from_here, | 349 const tracked_objects::Location& from_here, |
350 const std::string& message) OVERRIDE; | 350 const std::string& message) OVERRIDE; |
351 | 351 |
352 virtual void OnDisableDatatype(syncable::ModelType type, | 352 // Called when a datatype wishes to disable itself due to having hit an |
353 // unrecoverable error. | |
354 virtual void DisableBrokenDatatype(syncable::ModelType type, | |
akalin
2012/06/18 22:17:45
i think usual style is newline and indent after (
tim (not reviewing)
2012/06/18 22:47:54
Done.
| |
353 const tracked_objects::Location& from_here, | 355 const tracked_objects::Location& from_here, |
354 std::string message); | 356 std::string message); |
355 | 357 |
356 // The functions below (until ActivateDataType()) should only be | 358 // The functions below (until ActivateDataType()) should only be |
357 // called if sync_initialized() is true. | 359 // called if sync_initialized() is true. |
358 | 360 |
359 // TODO(akalin): This is called mostly by ModelAssociators and | 361 // TODO(akalin): This is called mostly by ModelAssociators and |
360 // tests. Figure out how to pass the handle to the ModelAssociators | 362 // tests. Figure out how to pass the handle to the ModelAssociators |
361 // directly, figure out how to expose this to tests, and remove this | 363 // directly, figure out how to expose this to tests, and remove this |
362 // function. | 364 // function. |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
770 browser_sync::Experiments current_experiments; | 772 browser_sync::Experiments current_experiments; |
771 | 773 |
772 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 774 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
773 }; | 775 }; |
774 | 776 |
775 bool ShouldShowActionOnUI( | 777 bool ShouldShowActionOnUI( |
776 const browser_sync::SyncProtocolError& error); | 778 const browser_sync::SyncProtocolError& error); |
777 | 779 |
778 | 780 |
779 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 781 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
OLD | NEW |