Loading CHANGELOG.md +6 −1 Original line number Diff line number Diff line # 88.0.4324.149 * fix proxy PAC URL option not working (fixes https://github.com/bromite/bromite/issues/908) * store proxy configuration in LocalState instead of Profile (thanks to @uazo) * fix toggle for reversing the meaning of bypass rules (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/884) * ignore managed state and policies for secure DNS (fixes https://github.com/bromite/bromite/issues/832) # 88.0.4324.141 * fix bookmarks not opening (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/891) * fix proxy page not loading (fixes https://github.com/bromite/bromite/issues/890) * ignore managed state for secure DNS (fixes https://github.com/bromite/bromite/issues/832) # 88.0.4324.95 * fix broken recent tabs behaviour (fixes https://github.com/bromite/bromite/issues/886) Loading build/RELEASE +1 −1 Original line number Diff line number Diff line 88.0.4324.141 88.0.4324.149 build/bromite_patches_list.txt +2 −1 Original line number Diff line number Diff line Loading @@ -154,5 +154,6 @@ Enable-network-isolation-features.patch Disable-unified-autoplay-feature.patch Revert-flags-remove-num-raster-threads.patch webview-Hard-no-to-persistent-histograms.patch Ignore-managed-state-for-secure-DNS.patch Ignore-managed-state-and-policies-for-secure-DNS.patch Do-not-permit-user-installed-certificates.patch Automated-domain-substitution.patch build/patches/Add-a-proxy-configuration-page.patch +14 −7 Original line number Diff line number Diff line Loading @@ -6,6 +6,8 @@ Accessible from proxy settings and chrome://proxy Allows to use a PAC script URL, automatic configuration and explicit proxy settings. Offer auto-complete for the proxy page URL. Store proxy settings in LocalState instead of Profile, so that proxy is used for SimpleURLLoaders as well. --- chrome/android/java/res/values/values.xml | 3 + .../java/res/xml/privacy_preferences.xml | 4 + Loading @@ -18,10 +20,10 @@ Offer auto-complete for the proxy page URL. .../prefs/chrome_command_line_pref_store.cc | 2 +- chrome/browser/resources/proxy_config.css | 61 +++ chrome/browser/resources/proxy_config.html | 80 ++++ chrome/browser/resources/proxy_config.js | 262 +++++++++++ chrome/browser/resources/proxy_config.js | 263 +++++++++++ chrome/browser/ui/BUILD.gn | 2 + .../webui/chrome_web_ui_controller_factory.cc | 3 + chrome/browser/ui/webui/proxy_config_ui.cc | 413 ++++++++++++++++++ chrome/browser/ui/webui/proxy_config_ui.cc | 417 ++++++++++++++++++ chrome/browser/ui/webui/proxy_config_ui.h | 33 ++ chrome/common/webui_url_constants.cc | 4 + chrome/common/webui_url_constants.h | 2 + Loading @@ -31,7 +33,7 @@ Offer auto-complete for the proxy page URL. .../proxy_config/proxy_config_dictionary.h | 7 +- net/proxy_resolution/proxy_config.cc | 52 ++- net/proxy_resolution/proxy_config.h | 3 + 24 files changed, 992 insertions(+), 15 deletions(-) 24 files changed, 997 insertions(+), 15 deletions(-) create mode 100644 chrome/browser/resources/proxy_config.css create mode 100644 chrome/browser/resources/proxy_config.html create mode 100644 chrome/browser/resources/proxy_config.js Loading Loading @@ -366,7 +368,7 @@ diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources new file mode 100644 --- /dev/null +++ b/chrome/browser/resources/proxy_config.js @@ -0,0 +1,262 @@ @@ -0,0 +1,263 @@ +/* + This file is part of Bromite. + Loading Loading @@ -526,7 +528,8 @@ new file mode 100644 + return { + "auto_detect": false, + "pac_url": $(kIdPacURL).value.trim(), + "pac_mandatory": $(kIdPacMandatory).checked + "pac_mandatory": $(kIdPacMandatory).checked, + "rules": {} + }; + } else if ($(kIdModeUseListPerScheme).checked || $(kIdModeUseSingleList).checked) { + var config = { Loading Loading @@ -665,7 +668,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webu new file mode 100644 --- /dev/null +++ b/chrome/browser/ui/webui/proxy_config_ui.cc @@ -0,0 +1,413 @@ @@ -0,0 +1,417 @@ +/* + This file is part of Bromite. + Loading Loading @@ -850,12 +853,16 @@ new file mode 100644 + + state.SetPath({"config", "auto_detect"}, base::Value(config.auto_detect())); + + auto rules = config.proxy_rules(); + if (config.has_pac_url()) { + state.SetPath({"config", "pac_url"}, base::Value(config.pac_url().spec())); + state.SetPath({"config", "pac_mandatory"}, base::Value(config.pac_mandatory())); + state.SetPath({"config", "rules", "type"}, base::Value("none")); + state.SetPath({"config", "rules", "bypass_rules"}, base::Value(rules.bypass_rules.ToString())); + state.SetPath({"config", "rules", "reverse_bypass"}, base::Value(rules.reverse_bypass)); + return; + } + + auto rules = config.proxy_rules(); + const char *type; + switch (rules.type) { + case net::ProxyConfig::ProxyRules::Type::EMPTY: Loading build/patches/Add-history-support-in-incognito-mode.patch +1 −1 Original line number Diff line number Diff line Loading @@ -163,7 +163,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/android/explore_sites/history_statistics_reporter.h" #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" @@ -903,6 +905,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -907,6 +909,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); Loading Loading
CHANGELOG.md +6 −1 Original line number Diff line number Diff line # 88.0.4324.149 * fix proxy PAC URL option not working (fixes https://github.com/bromite/bromite/issues/908) * store proxy configuration in LocalState instead of Profile (thanks to @uazo) * fix toggle for reversing the meaning of bypass rules (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/884) * ignore managed state and policies for secure DNS (fixes https://github.com/bromite/bromite/issues/832) # 88.0.4324.141 * fix bookmarks not opening (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/891) * fix proxy page not loading (fixes https://github.com/bromite/bromite/issues/890) * ignore managed state for secure DNS (fixes https://github.com/bromite/bromite/issues/832) # 88.0.4324.95 * fix broken recent tabs behaviour (fixes https://github.com/bromite/bromite/issues/886) Loading
build/bromite_patches_list.txt +2 −1 Original line number Diff line number Diff line Loading @@ -154,5 +154,6 @@ Enable-network-isolation-features.patch Disable-unified-autoplay-feature.patch Revert-flags-remove-num-raster-threads.patch webview-Hard-no-to-persistent-histograms.patch Ignore-managed-state-for-secure-DNS.patch Ignore-managed-state-and-policies-for-secure-DNS.patch Do-not-permit-user-installed-certificates.patch Automated-domain-substitution.patch
build/patches/Add-a-proxy-configuration-page.patch +14 −7 Original line number Diff line number Diff line Loading @@ -6,6 +6,8 @@ Accessible from proxy settings and chrome://proxy Allows to use a PAC script URL, automatic configuration and explicit proxy settings. Offer auto-complete for the proxy page URL. Store proxy settings in LocalState instead of Profile, so that proxy is used for SimpleURLLoaders as well. --- chrome/android/java/res/values/values.xml | 3 + .../java/res/xml/privacy_preferences.xml | 4 + Loading @@ -18,10 +20,10 @@ Offer auto-complete for the proxy page URL. .../prefs/chrome_command_line_pref_store.cc | 2 +- chrome/browser/resources/proxy_config.css | 61 +++ chrome/browser/resources/proxy_config.html | 80 ++++ chrome/browser/resources/proxy_config.js | 262 +++++++++++ chrome/browser/resources/proxy_config.js | 263 +++++++++++ chrome/browser/ui/BUILD.gn | 2 + .../webui/chrome_web_ui_controller_factory.cc | 3 + chrome/browser/ui/webui/proxy_config_ui.cc | 413 ++++++++++++++++++ chrome/browser/ui/webui/proxy_config_ui.cc | 417 ++++++++++++++++++ chrome/browser/ui/webui/proxy_config_ui.h | 33 ++ chrome/common/webui_url_constants.cc | 4 + chrome/common/webui_url_constants.h | 2 + Loading @@ -31,7 +33,7 @@ Offer auto-complete for the proxy page URL. .../proxy_config/proxy_config_dictionary.h | 7 +- net/proxy_resolution/proxy_config.cc | 52 ++- net/proxy_resolution/proxy_config.h | 3 + 24 files changed, 992 insertions(+), 15 deletions(-) 24 files changed, 997 insertions(+), 15 deletions(-) create mode 100644 chrome/browser/resources/proxy_config.css create mode 100644 chrome/browser/resources/proxy_config.html create mode 100644 chrome/browser/resources/proxy_config.js Loading Loading @@ -366,7 +368,7 @@ diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources new file mode 100644 --- /dev/null +++ b/chrome/browser/resources/proxy_config.js @@ -0,0 +1,262 @@ @@ -0,0 +1,263 @@ +/* + This file is part of Bromite. + Loading Loading @@ -526,7 +528,8 @@ new file mode 100644 + return { + "auto_detect": false, + "pac_url": $(kIdPacURL).value.trim(), + "pac_mandatory": $(kIdPacMandatory).checked + "pac_mandatory": $(kIdPacMandatory).checked, + "rules": {} + }; + } else if ($(kIdModeUseListPerScheme).checked || $(kIdModeUseSingleList).checked) { + var config = { Loading Loading @@ -665,7 +668,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webu new file mode 100644 --- /dev/null +++ b/chrome/browser/ui/webui/proxy_config_ui.cc @@ -0,0 +1,413 @@ @@ -0,0 +1,417 @@ +/* + This file is part of Bromite. + Loading Loading @@ -850,12 +853,16 @@ new file mode 100644 + + state.SetPath({"config", "auto_detect"}, base::Value(config.auto_detect())); + + auto rules = config.proxy_rules(); + if (config.has_pac_url()) { + state.SetPath({"config", "pac_url"}, base::Value(config.pac_url().spec())); + state.SetPath({"config", "pac_mandatory"}, base::Value(config.pac_mandatory())); + state.SetPath({"config", "rules", "type"}, base::Value("none")); + state.SetPath({"config", "rules", "bypass_rules"}, base::Value(rules.bypass_rules.ToString())); + state.SetPath({"config", "rules", "reverse_bypass"}, base::Value(rules.reverse_bypass)); + return; + } + + auto rules = config.proxy_rules(); + const char *type; + switch (rules.type) { + case net::ProxyConfig::ProxyRules::Type::EMPTY: Loading
build/patches/Add-history-support-in-incognito-mode.patch +1 −1 Original line number Diff line number Diff line Loading @@ -163,7 +163,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/android/explore_sites/history_statistics_reporter.h" #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" @@ -903,6 +905,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -907,6 +909,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); Loading