diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-06-19 10:32:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-04 10:20:27 +0200 |
| commit | 0dc8c5fd25aec13a5d3533f1e643d6ad17f9853e (patch) | |
| tree | 4375ad62dc59282e4fc12a79a387d966a8b53e8a /chromium/components/history/core/browser/web_history_service.cc | |
| parent | d3b6975af1d38d0c5cb07892c90ff4b9b90e332a (diff) | |
| download | qtwebengine-chromium-0dc8c5fd25aec13a5d3533f1e643d6ad17f9853e.tar.gz | |
Adapt favicon and history component for WebEngine
- Remove component/sync dependency of component/history
- Add FaviconHandler::Type() to support toggle touch icons at runtime
- Add FaviconHandler::Delegate::OnHandlerCompleted() to notify when icon
downloading is done
- Make FaviconHandler and FaviconService working when HistoryService is
not set due to off-the-record profile
Task-number: QTBUG-51184
Change-Id: Ic596f216b270ac4b76f0f37feb6d523d50592aae
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/history/core/browser/web_history_service.cc')
| -rw-r--r-- | chromium/components/history/core/browser/web_history_service.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/components/history/core/browser/web_history_service.cc b/chromium/components/history/core/browser/web_history_service.cc index 6a5059cda18..a9197b5688c 100644 --- a/chromium/components/history/core/browser/web_history_service.cc +++ b/chromium/components/history/core/browser/web_history_service.cc @@ -22,8 +22,10 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_access_token_fetcher.h" #include "components/signin/public/identity_manager/scope_set.h" +#if !defined(TOOLKIT_QT) #include "components/sync/base/sync_util.h" #include "components/sync/protocol/history_status.pb.h" +#endif #include "google_apis/gaia/gaia_urls.h" #include "google_apis/gaia/google_service_auth_error.h" #include "net/base/load_flags.h" @@ -527,6 +529,7 @@ void WebHistoryService::QueryWebAndAppActivity( request->Start(); } +#if !defined(TOOLKIT_QT) void WebHistoryService::QueryOtherFormsOfBrowsingHistory( version_info::Channel channel, QueryOtherFormsOfBrowsingHistoryCallback callback, @@ -563,6 +566,7 @@ void WebHistoryService::QueryOtherFormsOfBrowsingHistory( request->Start(); } +#endif // !defined(TOOLKIT_QT) // static void WebHistoryService::QueryHistoryCompletionCallback( @@ -643,6 +647,7 @@ void WebHistoryService::QueryWebAndAppActivityCompletionCallback( std::move(callback).Run(web_and_app_activity_enabled); } +#if !defined(TOOLKIT_QT) void WebHistoryService::QueryOtherFormsOfBrowsingHistoryCompletionCallback( WebHistoryService::QueryOtherFormsOfBrowsingHistoryCallback callback, WebHistoryService::Request* request, @@ -660,5 +665,6 @@ void WebHistoryService::QueryOtherFormsOfBrowsingHistoryCompletionCallback( std::move(callback).Run(has_other_forms_of_browsing_history); } +#endif // !defined(TOOLKIT_QT) } // namespace history |