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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
54 class Profile; | 54 class Profile; |
55 class ProfileOAuth2TokenService; | 55 class ProfileOAuth2TokenService; |
56 class ProfileSyncComponentsFactory; | 56 class ProfileSyncComponentsFactory; |
57 class SyncErrorController; | 57 class SyncErrorController; |
58 | 58 |
59 namespace base { | 59 namespace base { |
60 class CommandLine; | 60 class CommandLine; |
61 }; | 61 }; |
62 | 62 |
63 namespace extensions { | 63 namespace extensions { |
64 struct Event; | 64 struct Event; |
stanisc
2014/06/19 17:07:03
I didn't see Event used below? Do you really need
Nicolas Zea
2014/06/19 21:13:02
Wasn't added by this patch, but removed.
| |
65 } | 65 } |
66 | 66 |
67 namespace browser_sync { | 67 namespace browser_sync { |
68 class BackendMigrator; | 68 class BackendMigrator; |
69 class ChangeProcessor; | 69 class ChangeProcessor; |
70 class DataTypeManager; | 70 class DataTypeManager; |
71 class DeviceInfo; | 71 class DeviceInfo; |
72 class FaviconCache; | 72 class FaviconCache; |
73 class JsController; | 73 class JsController; |
74 class OpenTabsUIDelegate; | 74 class OpenTabsUIDelegate; |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
546 | 546 |
547 // Returns whether sync is managed, i.e. controlled by configuration | 547 // Returns whether sync is managed, i.e. controlled by configuration |
548 // management. If so, the user is not allowed to configure sync. | 548 // management. If so, the user is not allowed to configure sync. |
549 virtual bool IsManaged() const; | 549 virtual bool IsManaged() const; |
550 | 550 |
551 // syncer::UnrecoverableErrorHandler implementation. | 551 // syncer::UnrecoverableErrorHandler implementation. |
552 virtual void OnUnrecoverableError( | 552 virtual void OnUnrecoverableError( |
553 const tracked_objects::Location& from_here, | 553 const tracked_objects::Location& from_here, |
554 const std::string& message) OVERRIDE; | 554 const std::string& message) OVERRIDE; |
555 | 555 |
556 // Called when a datatype wishes to disable itself due to having hit an | 556 // Called when a datatype wishes to disable itself. Note, this does not change |
557 // unrecoverable error. | 557 // preferred state of a datatype and is not persisted across restarts. |
558 virtual void DisableBrokenDatatype( | 558 virtual void DisableDatatype(syncer::ModelType type, |
559 syncer::ModelType type, | 559 const tracked_objects::Location& from_here, |
560 const tracked_objects::Location& from_here, | 560 std::string message); |
561 std::string message); | 561 |
562 // Called to re-enable a type disabled by DisableDatatype(..). Note, this does | |
563 // not change the preferred state of a datatype, and is not persisted across | |
564 // restarts. | |
565 void ReenableDatatype(syncer::ModelType type); | |
562 | 566 |
563 // The functions below (until ActivateDataType()) should only be | 567 // The functions below (until ActivateDataType()) should only be |
564 // called if sync_initialized() is true. | 568 // called if sync_initialized() is true. |
565 | 569 |
566 // TODO(akalin): This is called mostly by ModelAssociators and | 570 // TODO(akalin): This is called mostly by ModelAssociators and |
567 // tests. Figure out how to pass the handle to the ModelAssociators | 571 // tests. Figure out how to pass the handle to the ModelAssociators |
568 // directly, figure out how to expose this to tests, and remove this | 572 // directly, figure out how to expose this to tests, and remove this |
569 // function. | 573 // function. |
570 virtual syncer::UserShare* GetUserShare() const; | 574 virtual syncer::UserShare* GetUserShare() const; |
571 | 575 |
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1123 base::Callback<void(Profile*, base::Time, base::Time)> clear_browsing_data_; | 1127 base::Callback<void(Profile*, base::Time, base::Time)> clear_browsing_data_; |
1124 | 1128 |
1125 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 1129 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
1126 }; | 1130 }; |
1127 | 1131 |
1128 bool ShouldShowActionOnUI( | 1132 bool ShouldShowActionOnUI( |
1129 const syncer::SyncProtocolError& error); | 1133 const syncer::SyncProtocolError& error); |
1130 | 1134 |
1131 | 1135 |
1132 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 1136 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
OLD | NEW |