-
Notifications
You must be signed in to change notification settings - Fork 895
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Modified patch for HistoryModelTypeController; added patch HistoryDel…
…eteDirectivesModelTypeController
- Loading branch information
1 parent
d644658
commit 6696d3f
Showing
2 changed files
with
20 additions
and
8 deletions.
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
...onents-history-core-browser-sync-history_delete_directives_model_type_controller.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/components/history/core/browser/sync/history_delete_directives_model_type_controller.cc b/components/history/core/browser/sync/history_delete_directives_model_type_controller.cc | ||
| index f7dbc9b6779bf246e0dce502be286c008fc0be14..41a31c5ff978fa8c7965aa02753b5fe058411028 100644 | ||
| --- a/components/history/core/browser/sync/history_delete_directives_model_type_controller.cc | ||
| +++ b/components/history/core/browser/sync/history_delete_directives_model_type_controller.cc | ||
| @@ -64,6 +64,7 @@ HistoryDeleteDirectivesModelTypeController:: | ||
| syncer::DataTypeController::PreconditionState | ||
| HistoryDeleteDirectivesModelTypeController::GetPreconditionState() const { | ||
| DCHECK(CalledOnValidThread()); | ||
| + if (static_cast<int>(type()) > 0) return PreconditionState::kPreconditionsMet; | ||
| if (helper_.sync_service()->GetUserSettings()->IsEncryptEverythingEnabled()) { | ||
| return PreconditionState::kMustStopAndClearData; | ||
| } |
16 changes: 8 additions & 8 deletions
16
patches/components-history-core-browser-sync-history_model_type_controller.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| diff --git a/components/history/core/browser/sync/history_model_type_controller.cc b/components/history/core/browser/sync/history_model_type_controller.cc | ||
| index 77b8d10dabd8a14beb4e2b8b80060d0418f744f1..f597e70d46c09a689393aed9ef6350a460e99266 100644 | ||
| index 77b8d10dabd8a14beb4e2b8b80060d0418f744f1..18a1d711fc6c3b398a81f6cef9bd2db745033cbc 100644 | ||
| --- a/components/history/core/browser/sync/history_model_type_controller.cc | ||
| +++ b/components/history/core/browser/sync/history_model_type_controller.cc | ||
| @@ -145,6 +145,7 @@ HistoryModelTypeController::~HistoryModelTypeController() = default; | ||
|
|
||
| syncer::DataTypeController::PreconditionState | ||
| HistoryModelTypeController::GetPreconditionState() const { | ||
| @@ -155,6 +155,7 @@ HistoryModelTypeController::GetPreconditionState() const { | ||
| return PreconditionState::kMustStopAndClearData; | ||
| } | ||
| DCHECK_EQ(type(), syncer::HISTORY); | ||
| + if (static_cast<int>(type()) > 0) return PreconditionState::kPreconditionsMet; | ||
| if (!base::FeatureList::IsEnabled(syncer::kSyncEnableHistoryDataType)) { | ||
| DCHECK_EQ(type(), syncer::TYPED_URLS); | ||
| return helper_.GetPreconditionState(); | ||
|
|
||
| // syncer::HISTORY doesn't support custom passphrase encryption. | ||
| if (helper_.sync_service()->GetUserSettings()->IsEncryptEverythingEnabled()) { |