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

fix resource organization and dependencies #719

Merged
merged 3 commits into from
Oct 24, 2018
Merged

fix resource organization and dependencies #719

merged 3 commits into from
Oct 24, 2018

Conversation

bridiver
Copy link
Collaborator

@bridiver bridiver commented Oct 23, 2018

fix brave/brave-browser#1808

brave browser implementation: brave/brave-browser#1817

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

@bridiver bridiver self-assigned this Oct 23, 2018
"//chrome/browser:resources",
"//chrome/common:resources",
"//chrome/renderer:resources",
+ "//brave:resources",
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

there are chromium_src overrides that use generated header files from the resources

@NejcZdovc
Copy link
Contributor

@bridiver please fix linter

@bridiver
Copy link
Collaborator Author

@NejcZdovc not sure what you're referring to

@petemill
Copy link
Member

@bridiver We need a corresponding change in brave-browser for the rewards extension messages.json path https://github.com/brave/brave-browser/blob/master/lib/l10nUtil.js#L58

@petemill
Copy link
Member

petemill commented Oct 24, 2018

While we're here, 'brave_rewards/resources/ui' directory feels a little weird to me, since it's only 1 part of the ui. Yes it's the thing that renders at brave://rewards so I guess it could be considered the 'main' UI. But is there a clearer directory name, e.g.

components/brave_rewards/resources:
- extension <-- if this becomes a WebUI, it could be called 'rewards-dialog-webui'
- donate-dialog-webui
- tip-dialog-webui <-- soon
- rewards-webui <-- was 'ui'

@bridiver
Copy link
Collaborator Author

@petemill yep, it's weird, but I didn't want to make even more changes in one PR

@bridiver
Copy link
Collaborator Author

mainly I just wanted to get everything grouped under resources and in a grd file for the component

@bridiver
Copy link
Collaborator Author

I think braveComponentsResourcesPath also needs to change to use the string grd file?

@bridiver
Copy link
Collaborator Author

@bbondy anything else you see here for brave-browser changes?

@bridiver
Copy link
Collaborator Author

brave/brave-browser#1817

@bridiver
Copy link
Collaborator Author

maybe the next change I'll make is to move that stuff from brave-browser to brave-core. These linked PRs across the repos really shouldn't be necessary

@bridiver
Copy link
Collaborator Author

I'd really like to expedite this if everything looks good to unblock @SergeyZhukovsky

@NejcZdovc
Copy link
Contributor

@bridiver can you please rebase

…his is what brave_components_resources did so just sticking with that for now
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.

Builds and runs 👍

bridiver added a commit to brave/brave-browser that referenced this pull request Oct 24, 2018
@bridiver bridiver merged commit e300d5a into master Oct 24, 2018
@NejcZdovc NejcZdovc deleted the issues/1808 branch October 24, 2018 20:49
@bridiver bridiver mentioned this pull request Oct 24, 2018
@bridiver
Copy link
Collaborator Author

bridiver commented Oct 24, 2018

0.56.x 3317936
0.57.x 0d27933

bridiver added a commit to brave/brave-browser that referenced this pull request Oct 24, 2018
bridiver added a commit that referenced this pull request Oct 25, 2018
bridiver added a commit to brave/brave-browser that referenced this pull request Oct 25, 2018
@bbondy bbondy added this to the 0.56.x - Release milestone Jan 14, 2019
petemill pushed a commit that referenced this pull request Jul 27, 2020
petemill pushed a commit that referenced this pull request Jul 27, 2020
petemill pushed a commit that referenced this pull request Jul 28, 2020
petemill pushed a commit that referenced this pull request Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

component resources have organizational and dependency issues
4 participants