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

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

Issue 436733002: [Sync] Use OnSingleDataTypeUnrecoverableError for all errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 4 months 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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 541
542 // Returns whether sync is managed, i.e. controlled by configuration 542 // Returns whether sync is managed, i.e. controlled by configuration
543 // management. If so, the user is not allowed to configure sync. 543 // management. If so, the user is not allowed to configure sync.
544 virtual bool IsManaged() const; 544 virtual bool IsManaged() const;
545 545
546 // syncer::UnrecoverableErrorHandler implementation. 546 // syncer::UnrecoverableErrorHandler implementation.
547 virtual void OnUnrecoverableError( 547 virtual void OnUnrecoverableError(
548 const tracked_objects::Location& from_here, 548 const tracked_objects::Location& from_here,
549 const std::string& message) OVERRIDE; 549 const std::string& message) OVERRIDE;
550 550
551 // Called when a datatype wishes to disable itself. The datatype to be
552 // disabled is passed via |error.model_type()|. Note, this does not change
553 // preferred state of a datatype and is not persisted across restarts.
554 virtual void DisableDatatype(const syncer::SyncError& error);
555
556 // Called to re-enable a type disabled by DisableDatatype(..). Note, this does 551 // Called to re-enable a type disabled by DisableDatatype(..). Note, this does
557 // not change the preferred state of a datatype, and is not persisted across 552 // not change the preferred state of a datatype, and is not persisted across
558 // restarts. 553 // restarts.
559 void ReenableDatatype(syncer::ModelType type); 554 void ReenableDatatype(syncer::ModelType type);
560 555
561 // The functions below (until ActivateDataType()) should only be 556 // The functions below (until ActivateDataType()) should only be
562 // called if sync_initialized() is true. 557 // called if sync_initialized() is true.
563 558
564 // TODO(akalin): This is called mostly by ModelAssociators and 559 // TODO(akalin): This is called mostly by ModelAssociators and
565 // tests. Figure out how to pass the handle to the ModelAssociators 560 // tests. Figure out how to pass the handle to the ModelAssociators
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 scoped_ptr<base::Time> last_backup_time_; 1132 scoped_ptr<base::Time> last_backup_time_;
1138 1133
1139 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 1134 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
1140 }; 1135 };
1141 1136
1142 bool ShouldShowActionOnUI( 1137 bool ShouldShowActionOnUI(
1143 const syncer::SyncProtocolError& error); 1138 const syncer::SyncProtocolError& error);
1144 1139
1145 1140
1146 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 1141 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698