Chromium Code Reviews| Index: ios/chrome/browser/ui/history/history_collection_view_controller.mm |
| diff --git a/ios/chrome/browser/ui/history/history_collection_view_controller.mm b/ios/chrome/browser/ui/history/history_collection_view_controller.mm |
| index e04173248a999f2de57f7a84a3d26fd7c09a869b..6744d84e627436f5a0ccc3bfb99c2ed82ab7ca74 100644 |
| --- a/ios/chrome/browser/ui/history/history_collection_view_controller.mm |
| +++ b/ios/chrome/browser/ui/history/history_collection_view_controller.mm |
| @@ -329,7 +329,11 @@ const CGFloat kSeparatorInset = 10; |
| SyncSetupServiceFactory::GetForBrowserState(_browserState); |
| if (syncSetupService->IsSyncEnabled() && |
| syncSetupService->IsDataTypeEnabled(syncer::HISTORY_DELETE_DIRECTIVES) && |
| - !result.sync_returned) { |
| + !result.sync_returned && |
| + // TODO(ramyasharma): Remove this check when sync bug is fixed. |
|
sczs
2017/03/31 15:58:01
Please use format TODO(crbug.com/####): as in http
ramyasharma
2017/04/04 01:44:06
Done.
|
| + // HISTORY_DELETE_DIRECTIVES should be disabled when passphrase is |
| + // enabled. See crbug/679347. |
| + !syncSetupService->IsSecondaryPassphraseEnabled()) { |
| [self showHistoryMatchingQuery:_currentQuery]; |
| return; |
| } |