diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/extensions/common/permissions | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/common/permissions')
| -rw-r--r-- | chromium/extensions/common/permissions/api_permission.h | 1 | ||||
| -rw-r--r-- | chromium/extensions/common/permissions/base_set_operators.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chromium/extensions/common/permissions/api_permission.h b/chromium/extensions/common/permissions/api_permission.h index cd40e2de53a..392acbfcb11 100644 --- a/chromium/extensions/common/permissions/api_permission.h +++ b/chromium/extensions/common/permissions/api_permission.h @@ -268,6 +268,7 @@ class APIPermission { kPrinting = 224, kCrashReportPrivate = 225, kAutofillAssistantPrivate = 226, + kEnterpriseNetworkingAttributes = 227, // Last entry: Add new entries above and ensure to update the // "ExtensionPermission3" enum in tools/metrics/histograms/enums.xml // (by running update_extension_permission.py). diff --git a/chromium/extensions/common/permissions/base_set_operators.h b/chromium/extensions/common/permissions/base_set_operators.h index 729b3f787a5..15e6e7e74ad 100644 --- a/chromium/extensions/common/permissions/base_set_operators.h +++ b/chromium/extensions/common/permissions/base_set_operators.h @@ -11,7 +11,7 @@ #include <map> #include <memory> -#include "base/logging.h" +#include "base/check.h" namespace extensions { |