From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- .../android/blocked_content_resource_id.h | 27 ++++++++++++++++++++++ .../components/resources/android/theme_resources.h | 1 + 2 files changed, 28 insertions(+) create mode 100644 chromium/components/resources/android/blocked_content_resource_id.h (limited to 'chromium/components/resources/android') diff --git a/chromium/components/resources/android/blocked_content_resource_id.h b/chromium/components/resources/android/blocked_content_resource_id.h new file mode 100644 index 00000000000..aa1e9cd9d2d --- /dev/null +++ b/chromium/components/resources/android/blocked_content_resource_id.h @@ -0,0 +1,27 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// This file maps resource IDs to Android resource IDs. + +// Presence of regular include guards is checked by: +// 1. cpplint +// 2. a custom presubmit in src/PRESUBMIT.py +// 3. clang (but it only checks the guard is correct if present) +// Disable the first two with these magic comments: +// NOLINT(build/header_guard) +// no-include-guard-because-multiply-included + +// LINK_RESOURCE_ID is used for IDs that come from a .grd file. +#ifndef LINK_RESOURCE_ID +#error "LINK_RESOURCE_ID should be defined before including this file" +#endif +// DECLARE_RESOURCE_ID is used for IDs that don't have .grd entries, and +// are only declared in this file. +#ifndef DECLARE_RESOURCE_ID +#error "DECLARE_RESOURCE_ID should be defined before including this file" +#endif + +// InfoBar resources. +DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_BLOCKED_POPUPS, + R.drawable.infobar_blocked_popups) diff --git a/chromium/components/resources/android/theme_resources.h b/chromium/components/resources/android/theme_resources.h index a84712ddf37..b48a7a50a5f 100644 --- a/chromium/components/resources/android/theme_resources.h +++ b/chromium/components/resources/android/theme_resources.h @@ -14,6 +14,7 @@ enum { // Not used; just provides a starting value for the enum. These must // not conflict with IDR_* values, which top out at 2^16 - 1. ANDROID_COMPONENTS_RESOURCE_ID_NONE = 1 << 16, +#include "components/resources/android/blocked_content_resource_id.h" #include "components/resources/android/page_info_resource_id.h" #include "components/resources/android/permissions_resource_id.h" ANDROID_COMPONENTS_RESOURCE_ID_MAX, -- cgit v1.2.1