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

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: More cleanup 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 540
541 // Returns whether sync is managed, i.e. controlled by configuration 541 // Returns whether sync is managed, i.e. controlled by configuration
542 // management. If so, the user is not allowed to configure sync. 542 // management. If so, the user is not allowed to configure sync.
543 virtual bool IsManaged() const; 543 virtual bool IsManaged() const;
544 544
545 // syncer::UnrecoverableErrorHandler implementation. 545 // syncer::UnrecoverableErrorHandler implementation.
546 virtual void OnUnrecoverableError( 546 virtual void OnUnrecoverableError(
547 const tracked_objects::Location& from_here, 547 const tracked_objects::Location& from_here,
548 const std::string& message) OVERRIDE; 548 const std::string& message) OVERRIDE;
549 549
550 // Called when a datatype wishes to disable itself. The datatype to be
551 // disabled is passed via |error.model_type()|. Note, this does not change
552 // preferred state of a datatype and is not persisted across restarts.
553 virtual void DisableDatatype(const syncer::SyncError& error);
554
555 // Called to re-enable a type disabled by DisableDatatype(..). Note, this does 550 // Called to re-enable a type disabled by DisableDatatype(..). Note, this does
556 // not change the preferred state of a datatype, and is not persisted across 551 // not change the preferred state of a datatype, and is not persisted across
557 // restarts. 552 // restarts.
558 void ReenableDatatype(syncer::ModelType type); 553 void ReenableDatatype(syncer::ModelType type);
559 554
560 // The functions below (until ActivateDataType()) should only be 555 // The functions below (until ActivateDataType()) should only be
561 // called if sync_initialized() is true. 556 // called if sync_initialized() is true.
562 557
563 // TODO(akalin): This is called mostly by ModelAssociators and 558 // TODO(akalin): This is called mostly by ModelAssociators and
564 // tests. Figure out how to pass the handle to the ModelAssociators 559 // tests. Figure out how to pass the handle to the ModelAssociators
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 scoped_ptr<base::Time> last_backup_time_; 1131 scoped_ptr<base::Time> last_backup_time_;
1137 1132
1138 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 1133 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
1139 }; 1134 };
1140 1135
1141 bool ShouldShowActionOnUI( 1136 bool ShouldShowActionOnUI(
1142 const syncer::SyncProtocolError& error); 1137 const syncer::SyncProtocolError& error);
1143 1138
1144 1139
1145 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 1140 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698