diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2024-11-11 13:21:32 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2025-08-12 09:41:32 +0000 |
| commit | a7a66e1facdb65065372fd94d9858a3daa3ddb6b (patch) | |
| tree | b0b7b12b0e61f546d57c4d1fae14fcbcaf32db02 | |
| parent | 3c5262fe6eccf3ebfc62bb5f119f6591fcf6a610 (diff) | |
[fixup] Adapt favicon and history component for WebEngine126-based
We remove dependecy on identity_manager but we still
include some headers and require signin_buildflags.
Deals with compiler error on
chromium/components/history/core/browser/web_history_service.cc
...public/identity_manager/identity_manager.h:21,
from .../components/history/core/browser/web_history_service.cc:23:
...signin/internal/identity_manager/profile_oauth2_token_service.h:19:10:
fatal error:
components/signin/public/base/signin_buildflags.h: No such file or directory
This is just a quick fix.
Task-number: QTBUG-131094
Change-Id: I9038df815b56a478661feca153ce121e8a388fe9
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/603329
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit fbb7676d9ff3385157b48599a08c8b1d530f79b7)
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/663975
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | chromium/components/history/core/browser/web_history_service.cc | 2 |
1 files changed, 2 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 17a22c94691..306438be5a9 100644 --- a/chromium/components/history/core/browser/web_history_service.cc +++ b/chromium/components/history/core/browser/web_history_service.cc @@ -21,7 +21,9 @@ #include "base/values.h" #include "components/history/core/browser/web_history_service_observer.h" #include "components/signin/public/identity_manager/access_token_info.h" +#if !BUILDFLAG(IS_QTWEBENGINE) #include "components/signin/public/identity_manager/identity_manager.h" +#endif #include "components/signin/public/identity_manager/primary_account_access_token_fetcher.h" #include "components/signin/public/identity_manager/scope_set.h" #if !BUILDFLAG(IS_QTWEBENGINE) |