Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use COMPONENT_EXPORT(PERMISSIONS_COMMON) with kPermissionLifetime
Browse files Browse the repository at this point in the history
A recent change converted //components/permissions:permissions_common
from being a source set to a componnent, so we need to annotate this
declaration now for the symbol to get properly exported.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/7709f0ce1f555922ab538a6861205f3ee5a485fc

commit 7709f0ce1f555922ab538a6861205f3ee5a485fc
Author: Illia Klimov <elklm@google.com>
Date:   Mon Jul 5 09:42:39 2021 +0000

    Reland "Use GetLastCommittedOrigin for permissions."

    This reverts commit 2fb676a482e822fdd2bd9449e0dcd637c88f28e7.

    Reason for revert: The crash happens due to double base::Feature initialization. This CL fixes that.

    Original change's description:
    > Revert "Use GetLastCommittedOrigin for permissions."
    >
    > This reverts commit 57faf740e23368163ecbed24f76da11f9fe8875d.
    >
    > Reason for revert: speculative revert as this seems a prime candidate for the breakage in content_browsertests on Linux CrOS (https://ci.chromium.org/ui/p/chromium/builders/ci/linux-chromeos-dbg/24420/test-results)
    >
    > Original change's description:
    > > Use GetLastCommittedOrigin for permissions.
    > >
    > > Refactor call sites that work with origins for the purpose of permission
    > > state management to go through a central utility function that handles
    > > all edge cases.
    > >
    > > Bug: 698985,1210669,1220660
    > > Change-Id: If76fd05c831dd3d3ac6d1274a6f4d1404ee17957
    > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2944834
    > > Commit-Queue: Illia Klimov <elklm@google.com>
    > > Reviewed-by: Avi Drissman <avi@chromium.org>
    > > Reviewed-by: danakj <danakj@chromium.org>
    > > Reviewed-by: Mike Wasserman <msw@chromium.org>
    > > Reviewed-by: Balazs Engedy <engedy@chromium.org>
    > > Reviewed-by: Guido Urdaneta <guidou@chromium.org>
    > > Reviewed-by: Lei Zhang <thestig@chromium.org>
    > > Reviewed-by: Wez <wez@chromium.org>
    > > Cr-Commit-Position: refs/heads/master@{#896916}
    >
    > Bug: 698985,1210669,1220660
    > Change-Id: I3222c21d13f29f5365d283f0e1d3b730f3774409
    > No-Presubmit: true
    > No-Tree-Checks: true
    > No-Try: true
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2995064
    > Auto-Submit: W. James MacLean <wjmaclean@chromium.org>
    > Reviewed-by: Roman Arora <romanarora@google.com>
    > Reviewed-by: W. James MacLean <wjmaclean@chromium.org>
    > Owners-Override: Roman Arora <romanarora@google.com>
    > Owners-Override: W. James MacLean <wjmaclean@chromium.org>
    > Commit-Queue: W. James MacLean <wjmaclean@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#897033}

    Bug: 698985,1210669,1220660
mariospr committed Jul 27, 2021

Verified

This commit was signed with the committer’s verified signature.
timbray Tim Bray
1 parent d7e8980 commit e62353d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions chromium_src/components/permissions/features.h
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
namespace permissions {
namespace features {

COMPONENT_EXPORT(PERMISSIONS_COMMON)
extern const base::Feature kPermissionLifetime;

} // namespace features

0 comments on commit e62353d

Please sign in to comment.