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

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

Issue 388003002: Sync: Display non-severe errors on about:sync in gray color rather than red. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed failing unit test, added extra test case, addressed CR feedback. Created 6 years, 5 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
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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 542
543 // Returns whether sync is managed, i.e. controlled by configuration 543 // Returns whether sync is managed, i.e. controlled by configuration
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. The datatype to be
553 // 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 // preferred state of a datatype and is not persisted across restarts.
554 virtual void DisableDatatype(syncer::ModelType type, 555 virtual void DisableDatatype(const syncer::SyncError& error);
555 const tracked_objects::Location& from_here,
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 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 scoped_ptr<base::Time> last_backup_time_; 1136 scoped_ptr<base::Time> last_backup_time_;
1138 1137
1139 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 1138 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
1140 }; 1139 };
1141 1140
1142 bool ShouldShowActionOnUI( 1141 bool ShouldShowActionOnUI(
1143 const syncer::SyncProtocolError& error); 1142 const syncer::SyncProtocolError& error);
1144 1143
1145 1144
1146 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 1145 #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