Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add brave extension history to components/brave_extension/extension/brave_extension #1754

Merged
merged 369 commits into from
Feb 22, 2019

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Feb 21, 2019

Fix brave/brave-browser#1506
Fix brave/brave-browser#3399
Fix brave/brave-browser#1555

This is part 1 of 2 PRs on brave/brave-core

Important: Nothing in this PR is new, it is just importing the history from brave-extension and mounting it to components/brave_extension/extension/brave_extension

Part 2 of 2 can be found here:
#1755

brave/brave-browser branch for this is here:
brave/brave-browser#3446

Motivation for this task:
It reduces duplicated code, it makes uplift management easier, it avoids copying in tree.

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

yrliou and others added 30 commits April 5, 2018 11:38
3rd party fingerprinting protection
This reverts commit 330333d, reversing
changes made to fd3d4a7.
Revert "Merge pull request #16 from brave/test-fixes"
unblock components unit testing
re-enable components testing, fix broken styles in shields panel
Add settings for cookies and referrer blocking
Update to Webpack 4 and update strings for C66
allow brave-extension to run on chrome
If directly copying into framework bundle, mac_framework_bundle template
can cause error when framework bundle version is used.

When bundle version is newly added or changed to different version, mac_framework_bundle
template tries to removes and create all symbolic links in framework bundle to link to
new version.

If copying resources directly, it is already copied to bundle before symbolic
link in Brave Framework folder is created by template.
So, trying to removing existing symbolic link failed because it is real folder.
Use bundle_data to add locale resources to brave framework bundle
petemill
petemill previously approved these changes Feb 21, 2019
Copy link
Member

@petemill petemill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those 338 commits seem right!

cezaraugusto
cezaraugusto previously approved these changes Feb 21, 2019
Copy link
Contributor

@cezaraugusto cezaraugusto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added a commit to fix lint and one update required by jest. can't test the build right now but lint pass and tests pass so I'm approving

@petemill
Copy link
Member

@cezaraugusto should those code changes be in #1755 since this PR is just the existing history from brave-extension?

@cezaraugusto
Copy link
Contributor

ya I didn't see https://github.com/brave/brave-core/pull/1755/commits before reviewing this one and seems addressed in there so I reverted

cezaraugusto
cezaraugusto previously approved these changes Feb 21, 2019
emerick
emerick previously approved these changes Feb 22, 2019
Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bbondy bbondy dismissed stale reviews from emerick and cezaraugusto via 16001ec February 22, 2019 18:17
@bbondy bbondy merged commit 8279a61 into master Feb 22, 2019
@mihaiplesa mihaiplesa deleted the add-brave-extension branch May 13, 2019 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet