-
Notifications
You must be signed in to change notification settings - Fork 921
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
Use Brave-specific labels for os_crypt key #61
Conversation
|
||
namespace { | ||
|
||
-#if defined(GOOGLE_CHROME_BUILD) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we want these patches to be as small as possible for easier maintainability. There's no reason to remove the GOOGLE_CHROME_BUILD
define because that will never be hit. We should probably have our own flag like in muon. Maybe BRAVE_BUILD
, but in any case for this commit we only want to update chromium
to brave
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and I think there may be a second issue for the chrome importer hack that @darkdh can explain
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and importer hack should enumerate chromium and chrome
https://github.com/brave/muon/pull/227/files#diff-85ff0d997b1a2f089546f7b2823b0ad7R1023
because we used to share same safe storage as chromium
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bridiver I feel it is confusing to leave conditionals that we know "will never be hit" in, but appreciate that you prefer to keep unnecessary changes in the patches to a minimum. I will restore the unused conditionals and focus on keeping the patches small.
|
||
namespace { | ||
|
||
-#if defined(GOOGLE_CHROME_BUILD) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
||
namespace { | ||
|
||
-#if defined(GOOGLE_CHROME_BUILD) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and importer hack should enumerate chromium and chrome
https://github.com/brave/muon/pull/227/files#diff-85ff0d997b1a2f089546f7b2823b0ad7R1023
because we used to share same safe storage as chromium
3822367
to
fcb9e98
Compare
Refactored to take into account @bridiver and @darkdh's review comments. Please re-review. @darkdh I decided not to include the "chrome importer hack" in this PR, to keep it focused. I will include it in my upcoming "import passwords from Chrome" PR instead, unless you think it would be best to include it in this one. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++
actually write to the output dir so we don't rebuild every time
I used this codesearch to find all apparent mentions of "(C|c)hrom(e|ium)" labels used by the os_crypt backend and replaced them with Brave-specific labels. Brave doesn't have a Chrome vs. Chromium-style branding divide, so I removed the corresponding preprocessor conditionals as necessary.
If there's a better way to accomplish this other than adding a bunch of small patches, please let me know!
Resolves https://github.com/brave/brave/issues/110.