OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "components/browsing_data_ui/history_notice_utils.h" | 5 #include "components/browsing_data_ui/history_notice_utils.h" |
6 | 6 |
7 #include "components/browser_sync/browser/profile_sync_service.h" | 7 #include "components/browser_sync/browser/profile_sync_service.h" |
8 #include "components/history/core/browser/web_history_service.h" | 8 #include "components/history/core/browser/web_history_service.h" |
9 | 9 |
10 namespace browsing_data_ui { | 10 namespace browsing_data_ui { |
11 | 11 |
12 bool ShouldShowNoticeAboutOtherFormsOfBrowsingHistory( | 12 bool ShouldShowNoticeAboutOtherFormsOfBrowsingHistory( |
13 const ProfileSyncService* sync_service, | 13 const ProfileSyncService* sync_service, |
14 const history::WebHistoryService* history_service) { | 14 const history::WebHistoryService* history_service) { |
15 return sync_service && | 15 return sync_service && |
16 sync_service->IsUsingSecondaryPassphrase() && | 16 sync_service->IsSyncActive() && |
| 17 !sync_service->IsUsingSecondaryPassphrase() && |
17 history_service && | 18 history_service && |
18 history_service->HasOtherFormsOfBrowsingHistory(); | 19 history_service->HasOtherFormsOfBrowsingHistory(); |
19 } | 20 } |
20 | 21 |
21 } // namespace browsing_data_ui | 22 } // namespace browsing_data_ui |
OLD | NEW |