Index: components/browsing_data_ui/history_notice_utils.h |
diff --git a/components/browsing_data_ui/history_notice_utils.h b/components/browsing_data_ui/history_notice_utils.h |
index c3ab520d5ee69269011cda7091867744b72f8f89..ec854e5f586c22cf299b2085066dad30d8ccca8e 100644 |
--- a/components/browsing_data_ui/history_notice_utils.h |
+++ b/components/browsing_data_ui/history_notice_utils.h |
@@ -5,14 +5,22 @@ |
#ifndef COMPONENTS_BROWSING_DATA_UI_HISTORY_NOTICE_UTILS_H_ |
#define COMPONENTS_BROWSING_DATA_UI_HISTORY_NOTICE_UTILS_H_ |
-#include "base/callback_forward.h" |
+#include <string> |
-class ProfileSyncService; |
+#include "base/callback_forward.h" |
namespace history { |
class WebHistoryService; |
} |
+namespace sync_driver { |
+class SyncService; |
+} |
+ |
+namespace version_info { |
+enum class Channel; |
+} |
+ |
namespace browsing_data_ui { |
namespace testing { |
@@ -23,22 +31,33 @@ namespace testing { |
// found. Used only for testing. The default is false. |
extern bool g_override_other_forms_of_browsing_history_query; |
-} |
+} // testing |
// Whether the Clear Browsing Data UI should show a notice about the existence |
// of other forms of browsing history stored in user's account. The response |
// is returned in a |callback|. |
void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory( |
- const ProfileSyncService* sync_service, |
+ const sync_driver::SyncService* sync_service, |
history::WebHistoryService* history_service, |
base::Callback<void(bool)> callback); |
// Whether the Clear Browsing Data UI should popup a dialog with information |
// about the existence of other forms of browsing history stored in user's |
// account when the user deletes their browsing history for the first time. |
-// The response is returned in a |callback|. |
+// The response is returned in a |callback|. The |channel| and |is_tablet| |
+// parameters must be provided for successful communication with the Sync |
+// server, but the result does not depend from them. |
+void ShouldPopupDialogAboutOtherFormsOfBrowsingHistory( |
+ const sync_driver::SyncService* sync_service, |
+ history::WebHistoryService* history_service, |
+ version_info::Channel channel, |
+ bool is_tablet, |
sdefresne
2016/05/24 08:32:29
Since you already indirectly depends on ui/base (t
msramek
2016/05/24 12:03:00
Actually in that case, WebHistoryService itself ca
|
+ base::Callback<void(bool)> callback); |
+ |
+// A deprecated overloaded version of the above function called by iOS. |
+// TODO(msarda): Remove this when iOS calls the correct version. |
sdefresne
2016/05/24 08:32:29
Can you create a bug and use the format "TODO(crbu
msramek
2016/05/24 12:03:00
Done. crbug.com/614319
|
void ShouldPopupDialogAboutOtherFormsOfBrowsingHistory( |
- const ProfileSyncService* sync_service, |
+ const sync_driver::SyncService* sync_service, |
history::WebHistoryService* history_service, |
base::Callback<void(bool)> callback); |