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

Unified Diff: components/sync/model_impl/shared_model_type_processor.h

Issue 2623723002: [Sync] Remove ModelError::IsSet() in favor of base::Optional. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: components/sync/model_impl/shared_model_type_processor.h
diff --git a/components/sync/model_impl/shared_model_type_processor.h b/components/sync/model_impl/shared_model_type_processor.h
index 2b3814e196eb164abb92389d43ecdbb47f422ffa..b0e7de776b37aed8af3892c8c7b9e8e6e27d57c1 100644
--- a/components/sync/model_impl/shared_model_type_processor.h
+++ b/components/sync/model_impl/shared_model_type_processor.h
@@ -11,6 +11,7 @@
#include <unordered_set>
#include "base/memory/weak_ptr.h"
+#include "base/optional.h"
#include "base/threading/non_thread_safe.h"
#include "components/sync/base/model_type.h"
#include "components/sync/engine/cycle/status_counters.h"
@@ -147,7 +148,7 @@ class SharedModelTypeProcessor : public ModelTypeProcessor,
// A cache for any error that may occur during startup and should be passed
// into the |start_callback_|.
- ModelError start_error_;
+ base::Optional<ModelError> start_error_;
// Indicates whether the metadata has finished loading.
bool is_metadata_loaded_ = false;

Powered by Google App Engine
This is Rietveld 408576698