|
Break dependency of chrome.gyp:common on content.gyp:content_browser.
The dependency path is
src/chrome/chrome.gyp:common ->
src/components/components.gyp:policy_component ->
src/components/components.gyp:user_prefs ->
src/content/content.gyp:content_browser
This was introduced in https://codereview.chromium.org/102973005. The issue is
that URLBlacklistManager::RegisterProfilePrefs() uses a PrefServiceSyncable
which comes from user_prefs, and user_prefs depends on content::BrowserContext.
This fix splits the policy/common files into a policy_component_common target
that does not depend on user_prefs. chrome.gyp:common now depends on
policy_component_common, and chrome.gyp:browser depends on policy_component.
BUG= 332030
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=243567
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+314 lines, -831 lines) |
Patch |
|
M |
chrome/browser/managed_mode/managed_mode_url_filter.cc
|
View
|
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/net/chrome_network_delegate.cc
|
View
|
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/policy/url_blacklist_manager_unittest.cc
|
View
|
5
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/prefs/browser_prefs.cc
|
View
|
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/profiles/profile_io_data.cc
|
View
|
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/chrome_browser.gypi
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
chrome/chrome_common.gypi
|
View
|
1
2
3
4
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/policy.gypi
|
View
|
1
2
3
4
5
|
1 chunk |
+50 lines, -204 lines |
0 comments
|
Download
|
|
M |
components/policy/core/DEPS
|
View
|
5
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
components/policy/core/browser/DEPS
|
View
|
5
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
A + |
components/policy/core/browser/url_blacklist_manager.h
|
View
|
1
2
3
4
5
6
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
A + |
components/policy/core/browser/url_blacklist_manager.cc
|
View
|
5
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
D |
components/policy/core/common/url_blacklist_manager.h
|
View
|
5
|
1 chunk |
+0 lines, -227 lines |
0 comments
|
Download
|
|
D |
components/policy/core/common/url_blacklist_manager.cc
|
View
|
5
|
1 chunk |
+0 lines, -383 lines |
0 comments
|
Download
|
|
A |
components/policy/policy_browser.gypi
|
View
|
1
2
3
4
|
1 chunk |
+50 lines, -0 lines |
0 comments
|
Download
|
|
A |
components/policy/policy_common.gypi
|
View
|
1
2
3
4
|
1 chunk |
+191 lines, -0 lines |
0 comments
|
Download
|
|
M |
components/policy/policy_export.h
|
View
|
1
5
|
1 chunk |
+9 lines, -4 lines |
0 comments
|
Download
|
Total messages: 7 (0 generated)
|