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

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: 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
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. Note, this does not change
553 // preferred state of a datatype and is not persisted across restarts. 553 // preferred state of a datatype and is not persisted across restarts.
554 virtual void DisableDatatype(syncer::ModelType type, 554 virtual void DisableDatatype(syncer::ModelType type,
Nicolas Zea 2014/07/14 17:36:02 Does it make more sense to just pass a syncer::Syn
stanisc 2014/07/15 16:10:00 OK. I've done that.
555 syncer::SyncError::ErrorType error_type,
555 const tracked_objects::Location& from_here, 556 const tracked_objects::Location& from_here,
556 std::string message); 557 std::string message);
557 558
559 // Overloaded version of DisableDatatype that defaults to DATATYPE_ERROR
560 // error type.
561 void DisableDatatype(syncer::ModelType type,
562 const tracked_objects::Location& from_here,
Nicolas Zea 2014/07/14 17:36:02 nit: fix indent
stanisc 2014/07/15 16:10:00 Done.
563 std::string message);
564
558 // Called to re-enable a type disabled by DisableDatatype(..). Note, this does 565 // 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 566 // not change the preferred state of a datatype, and is not persisted across
560 // restarts. 567 // restarts.
561 void ReenableDatatype(syncer::ModelType type); 568 void ReenableDatatype(syncer::ModelType type);
562 569
563 // The functions below (until ActivateDataType()) should only be 570 // The functions below (until ActivateDataType()) should only be
564 // called if sync_initialized() is true. 571 // called if sync_initialized() is true.
565 572
566 // TODO(akalin): This is called mostly by ModelAssociators and 573 // TODO(akalin): This is called mostly by ModelAssociators and
567 // tests. Figure out how to pass the handle to the ModelAssociators 574 // tests. Figure out how to pass the handle to the ModelAssociators
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 base::Callback<void(Profile*, base::Time, base::Time)> clear_browsing_data_; 1132 base::Callback<void(Profile*, base::Time, base::Time)> clear_browsing_data_;
1126 1133
1127 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); 1134 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
1128 }; 1135 };
1129 1136
1130 bool ShouldShowActionOnUI( 1137 bool ShouldShowActionOnUI(
1131 const syncer::SyncProtocolError& error); 1138 const syncer::SyncProtocolError& error);
1132 1139
1133 1140
1134 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ 1141 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698