diff --git a/build/patches/00add-browser-policy.patch b/build/patches/00add-browser-policy.patch index 56f333d6..e7f2f5a6 100644 --- a/build/patches/00add-browser-policy.patch +++ b/build/patches/00add-browser-policy.patch @@ -4,6 +4,7 @@ Subject: Add browser policy --- base/win/win_util.cc | 63 +-------- + chrome/android/java/AndroidManifest.xml | 4 - .../privacy_preferences_manager_impl.cc | 5 + .../metrics/chrome_feature_list_creator.cc | 12 ++ .../policy/chrome_browser_policy_connector.cc | 2 - @@ -26,7 +27,7 @@ Subject: Add browser policy components/policy_strings.grdp | 4 +- .../gaia_cookie_manager_service.cc | 4 + google_apis/gaia/gaia_auth_fetcher.cc | 1 + - 23 files changed, 285 insertions(+), 89 deletions(-) + 24 files changed, 285 insertions(+), 93 deletions(-) diff --git a/base/win/win_util.cc b/base/win/win_util.cc --- a/base/win/win_util.cc @@ -111,6 +112,35 @@ diff --git a/base/win/win_util.cc b/base/win/win_util.cc return &state; } +diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml +--- a/chrome/android/java/AndroidManifest.xml ++++ b/chrome/android/java/AndroidManifest.xml +@@ -72,9 +72,7 @@ by a child template that "extends" this file. + + + +- + +- + + + +@@ -85,7 +83,6 @@ by a child template that "extends" this file. + + + +- + + + +@@ -131,7 +128,6 @@ by a child template that "extends" this file. + + + +- + + {% block extra_uses_permissions %} + {% endblock %} diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc --- a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc +++ b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc