Add strings for NavigationBar on relevant WebUI data sources directly #2384
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
simonhong
previously approved these changes
May 8, 2019
|
Dependency error is happened. |
|
got the same error as above |
|
Created brave/brave-browser#4343 to track the problem |
petemill
force-pushed
the
fix-ui-generated-resources-dep
branch
from
154f678 to
90fcbcd
Compare
petemill
changed the title
|
Updated with a completely different approach. Running tests now |
This fixes a layer-violation for dependencies where we were using a convenience function in the base //ui project in order to set the strings on all WebUI data sources. With this refactor, the dependencies are already in place from the chromium ui project (containing the webui data sources) to the brave webui project (containing the new navigation bar data provider). This new NavigationBarDataProvider is not much of a class, in that it only contains a single static function, but it follows the chromium practice of splitting data in to functional classes, and leaving it up to the provider as to whether it adds strings, functions or observers to the WebUI.
petemill
force-pushed
the
fix-ui-generated-resources-dep
branch
from
90fcbcd to
f37ff3f
Compare
simonhong
approved these changes
May 9, 2019
| void SetLoadTimeDataDefaults(const std::string& app_locale, | ||
| base::DictionaryValue* localized_strings) { | ||
|
|
||
| SetLoadTimeDataDefaults_ChromiumImpl(app_locale, localized_strings); | ||
| #if !defined(OS_ANDROID) |
There was a problem hiding this comment.
This define pair can be removed
|
|
||
| } // namespace | ||
|
|
||
| #include "../../../../../chrome/browser/ui/webui/history_ui.cc" |
|
|
||
| } // namespace | ||
|
|
||
| #include "../../../../../../chrome/browser/ui/webui/downloads/downloads_ui.cc" // NOLINT |
There was a problem hiding this comment.
lint fail by no last empty line?
| "brToolbarDownloadsTitle", IDS_DOWNLOAD_TITLE); | ||
| source->AddLocalizedString( | ||
| "brToolbarHistoryTitle", IDS_HISTORY_TITLE); | ||
| } |
|
|
||
| } // namespace | ||
|
|
||
| #include "../../../../../../chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc" |
bsclifton
added a commit
that referenced
this pull request
May 13, 2019
bsclifton
added a commit
that referenced
this pull request
May 13, 2019
Add strings for NavigationBar on relevant WebUI data sources directly --- Uplift of #2384 Fixes brave/brave-browser#4343
bsclifton
added a commit
that referenced
this pull request
May 13, 2019
Add strings for NavigationBar on relevant WebUI data sources directly --- Uplift of #2384 Fixes brave/brave-browser#4343
This was referenced May 13, 2019
bsclifton
added a commit
that referenced
this pull request
May 14, 2019
Add strings for NavigationBar on relevant WebUI data sources directly --- Uplift of #2384 Fixes brave/brave-browser#4343
bsclifton
added a commit
that referenced
this pull request
May 14, 2019
Add strings for NavigationBar on relevant WebUI data sources directly --- Uplift of #2384 Fixes brave/brave-browser#4343
bsclifton
added a commit
that referenced
this pull request
May 15, 2019
Merge pull request #2384 from brave/fix-ui-generated-resources-dep
bsclifton
added a commit
that referenced
this pull request
May 15, 2019
Merge pull request #2384 from brave/fix-ui-generated-resources-dep
petemill
added a commit
that referenced
this pull request
May 17, 2019
This was referenced May 17, 2019
Merged
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.
This fixes an intermittent build error due to the generated_resources being included in web_ui_util (inside the //ui/base project)
This fixes a layer-violation for dependencies where we were using a convenience function in the base //ui project in order to set the strings on all WebUI data sources. With this refactor, the dependencies are already in place from the chromium ui project (containing the webui data sources) to the brave webui project (containing the new navigation bar data provider).
This new NavigationBarDataProvider is not much of a class, in that it only contains a single static function, but it follows the chromium practice of splitting data in to functional classes, and leaving it up to the provider as to whether it adds strings, functions or observers to the WebUI.
Fix brave/brave-browser#4343
Submitter Checklist:
npm test brave_unit_tests && npm test brave_browser_tests && npm run test-security) onnpm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Reviewer Checklist:
After-merge Checklist:
changes has landed on.