Remove //content deps for iOS build #4070
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
AlexeyBarabash
added
CI/skip-android
darkdh
approved these changes
Nov 25, 2019
kylehickinson
approved these changes
Nov 25, 2019
AlexeyBarabash
force-pushed
the
fix-7087
branch
from
2c51550
to
001a559
Compare
|
Rebased and ensured build succeeded on mac for iOS |
bridiver
reviewed
Nov 25, 2019
| @@ -13,13 +13,17 @@ | |||
| #include "components/pref_registry/pref_registry_syncable.h" | |||
| #include "components/prefs/pref_service.h" | |||
| #include "components/prefs/scoped_user_pref_update.h" | |||
|
|
|||
| #if !defined(OS_IOS) | |||
|
|
|||
| #include "content/public/browser/browser_thread.h" | |||
|
|
|||
| void MigrateBraveSyncPrefs(Profile* profile) { | |||
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | |||
There was a problem hiding this comment.
please remove this DCHECK to eliminate the //content/public/browser dependency
bridiver
reviewed
Nov 25, 2019
| @@ -24,7 +24,9 @@ namespace user_prefs { | |||
| class PrefRegistrySyncable; | |||
| } | |||
|
|
|||
| #if !defined(OS_IOS) | |||
| void MigrateBraveSyncPrefs(Profile* profile); | |||
There was a problem hiding this comment.
also this is a problem, we can't have a dependency on Profile in a component. Please pass the PrefService instead
32 tasks
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.
Fixes brave/brave-browser#7087
Submitter Checklist:
npm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
npm run build -- Release --channel=nightly --official_build=true --target_os=iosReviewer Checklist:
After-merge Checklist:
changes has landed on.