Merge master for 0.53.2 release #314
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This error occurs when builds vr_common target. In C69, vr_common target is changed from static lib to shared lib. and vr_common depends on components/omnibox/browser target. To fix undefined reference to BraveAutocompleteController when builds vr_common shared lib, components/omnibox/browser should include brave/components/omnibox/browser.
In C69, vr_common target changed to shared lib. It has dependency chrome/common:channel_info and chrome/common:channel_info calls brave's code. To fix, our additional channel info implementation is added to chrome/common:channel_info target.
Fix linux build error
The brave binary will now function when started from the Linux zip package. Fixes brave/brave-browser#479
Native ledger 3rd party libs DEPS update
Update tweetnacl
Add missing requirements to Linux zip
1. Add AutoplayPermissionContext 2. Update PermissionDescriptorToPermissionType 3. RquestPermission from AutoplayPolicy 4. Content setting page & blocked status bubble 5. Auto refresh when clicking allow in permission ask bubble
…pl::GetIconId overrides
let each component handle its own transpiling
Disable chrome.braveShields only for brave-extension
There were link errors on Windows ``` ../../third_party/llvm-build/Release+Asserts/bin\lld-link.exe: error: undefined symbol: ?GetForProfile@PermissionManagerFactory@@SAPEAVPermissionManager@@PEAVProfile@@@z >>> referenced by C:\brave-browser\src\chrome\browser\permissions\permission_manager.cc:264 >>> browser.lib(permission_manager.obj):(?Get@PermissionManager@@SAPEAV1@PEAVProfile@@@z) ../../third_party/llvm-build/Release+Asserts/bin\lld-link.exe: error: undefined symbol: ?GetForProfile@PermissionManagerFactory@@SAPEAVPermissionManager@@PEAVProfile@@@z >>> referenced by C:\brave-browser\src\chrome\browser\budget_service\budget_service_impl.cc:56 >>> browser.lib(budget_service_impl.obj):(?GetBudget@BudgetServiceImpl@@UEAAXV?$OnceCallback@$$A6AXW4BudgetServiceErrorType@mojom@blink@@v?$vector@V?$InlinedStructPtr@VBudgetState@mojom@blink@@@mojo@@v?$allocator@V?$InlinedStructPtr@VBudgetState@mojom@blink@@@mojo@@@std@@@std@@@z@base@@@z) ../../third_party/llvm-build/Release+Asserts/bin\lld-link.exe: error: undefined symbol: ?GetForProfile@PermissionManagerFactory@@SAPEAVPermissionManager@@PEAVProfile@@@z >>> referenced by C:\brave-browser\src\chrome\browser\profiles\profile_impl.cc:1094 >>> browser.lib(profile_impl.obj):(?GetPermissionControllerDelegate@ProfileImpl@@UEAAPEAVPermissionControllerDelegate@content@@xz) ../../third_party/llvm-build/Release+Asserts/bin\lld-link.exe: error: undefined symbol: ?GetForProfile@PermissionManagerFactory@@SAPEAVPermissionManager@@PEAVProfile@@@z >>> referenced by C:\brave-browser\src\chrome\browser\profiles\off_the_record_profile_impl.cc:450 >>> browser.lib(off_the_record_profile_impl.obj):(?GetPermissionControllerDelegate@OffTheRecordProfileImpl@@UEAAPEAVPermissionControllerDelegate@content@@xz) ``` because b4842cc#diff-e9e16c8776e75c58827f5f1af6feac31R1 also changes signature of `PermissionManagerFactory::GetForProfile` but we only need `PermissionManagerFactory::BuildServiceInstanceFor`
Enable granular control of autoplay
Revert "let each component handle its own transpiling"
To execute different channel apps simultaneously, each app should have different app name and different id. This PR added different BRANDING files for each channel because Brave on MacOS refers BRANDING file to get unique app name and id.
Each channel app should have different bundle id to install/run them simultaneously.
Brave browser should show product name that includes channel because different channel apps can be run simultaneously. To do this, BRAVE_PRODUCT_STRING is set to CFBundleDisplayName in localized infoplist string instead of using IDS_PRODUCT_NAME only.
This property is newly introduced in C69.
Make different channel apps run simultaneously on MacOS
petemill
added a commit
that referenced
this pull request
Dec 11, 2018
Changes: ``` * cee363d - (44 minutes ago) Merge pull request #314 from brave/revert-sync-master — Pete Miller (HEAD -> master, origin/master, origin/HEAD) |\ | * 0ca4b73 - (56 minutes ago) Revert "sync v2" — Cezar Augusto | * a479cea - (56 minutes ago) Revert "Merge pull request #308 from brave/sync_img" — Cezar Augusto |/ * dd46eab - (19 hours ago) Merge pull request #247 from brave/c71-clock-period — Pete Miller |\ | * 20d2a61 - (7 weeks ago) Fix NTP clock for c71 — petemill (origin/c71-clock-period, c71-clock-period) * | 69a3399 - (19 hours ago) Merge pull request #305 from ryanml/android-rewards-title-fix — Pete Miller |\ \ | |/ |/| | * d92ce8f - (7 days ago) Fixing rewards toggle for long translations — ryanml (ryanml/android-rewards-title-fix, android-rewards-title-fix) |/ * 4692dfd - (25 hours ago) readme typos — Ross Moody * ca3e285 - (29 hours ago) Merge pull request #312 from emerick/rewards-backup-wallet-notification — Nejc Zdovc |\ | * 4dda1bc - (4 days ago) Add support for backupWallet notification — Emerick Rogul * | 0a5f56e - (4 days ago) Emoji Life — Ross Moody * | be16816 - (4 days ago) Readme formatting — Ross Moody * | 35b166d - (4 days ago) Brave UI Logo — Ross Moody * | fddeb8a - (4 days ago) Merge pull request #311 from brave/now-deploy-static — Cezar Augusto |\ \ | * | 6685301 - (5 days ago) Use new static deploy config for now instead of docker — petemill (origin/now-deploy-static, now-deploy-static) * | | eb49e8b - (4 days ago) remove list from README file — Cezar Augusto * | | 59eae8d - (4 days ago) remove outdated docs — Cezar Augusto * | | f04fecc - (4 days ago) do not count first letter if space in textareaclipboard — Cezar Augusto | |/ |/| * | 7ea9178 - (5 days ago) Merge pull request #308 from brave/sync_img — Cezar Augusto |\ \ | * | 470233f - (6 days ago) make sync images exportable — Cezar Augusto | |/ * | aa520cf - (5 days ago) Merge pull request #309 from brave/welcome_img — Pete Miller |\ \ | * | 870d3ba - (6 days ago) animation dial in — Ross Moody (origin/welcome_img, welcome_img) | * | 1c2525b - (6 days ago) make welcome page images exportable — Cezar Augusto | |/ * | 96ccb12 - (6 days ago) Merge pull request #307 from kirkins/patch-1 — Ryan Lanese |\ \ | * | f98a665 - (6 days ago) small typo — Philip Kirkbride * | | f3c38e1 - (6 days ago) v0.36.0 — ryanml (tag: v0.36.0) |/ / * | 46b3501 - (6 days ago) Merge pull request #304 from ryanml/disabled-panel — Nejc Zdovc |\ \ | * | 6be56a3 - (7 days ago) Adding disabledPanel component — ryanml (ryanml/disabled-panel) |/ / * | 79b16fb - (6 days ago) Merge pull request #299 from ryanml/fix-298 — Nejc Zdovc |\ \ | |/ |/| | * c79530c - (12 days ago) Fixes #298, uses string type for amount/tokens — ryanml (ryanml/fix-298, fix-298) * 6bf8054 - (8 days ago) v0.35.0 — Cezar Augusto (tag: v0.35.0, now-deploy-reliable) * 3535427 - (3 weeks ago) sync v2 — Cezar Augusto * 10f07c0 - (9 days ago) Merge pull request #300 from brave/site-banner-icon — Ryan Lanese |\ | * da3cc4b - (11 days ago) Site banner icon update — Ross Moody * 9064f12 - (9 days ago) Merge pull request #301 from emerick/rewards-insufficient-funds-notification — Ryan Lanese * 5300262 - (11 days ago) Add support for insufficientFunds notification — Emerick Rogul ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge master into the 0.53.x branch