Commit b428361e authored by Nicolas Ouellet-Payeur's avatar Nicolas Ouellet-Payeur Committed by Commit Bot

[BrowserSwitcher] Update traffic annotations

Change-Id: I22d7e63b29cb5d707cc2e5a3d68a66b6a10eeac6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803668
Auto-Submit: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: default avatarRamin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697105}
parent afee7cdd
...@@ -38,38 +38,41 @@ const base::TimeDelta kRefreshSitelistDelay = base::TimeDelta::FromMinutes(30); ...@@ -38,38 +38,41 @@ const base::TimeDelta kRefreshSitelistDelay = base::TimeDelta::FromMinutes(30);
// How many times to re-try fetching the XML file for the sitelist. // How many times to re-try fetching the XML file for the sitelist.
const int kFetchNumRetries = 1; const int kFetchNumRetries = 1;
// TODO(nicolaso): Add chrome_policy for this annotation once the policy is
// implemented.
constexpr net::NetworkTrafficAnnotationTag traffic_annotation = constexpr net::NetworkTrafficAnnotationTag traffic_annotation =
net::DefineNetworkTrafficAnnotation("browser_switcher_ieem_sitelist", R"( net::DefineNetworkTrafficAnnotation("browser_switcher_ieem_sitelist", R"(
semantics { semantics {
sender: "Browser Switcher" sender: "Legacy Browser Support "
description: description:
"BrowserSwitcher may download Internet Explorer's Enterprise Mode " "Legacy Browser Support may download Internet Explorer's "
"SiteList XML, to load the list of URLs to open in an alternative " "Enterprise Mode SiteList XML, to load the list of URLs to open in "
"browser. This is often on the organization's intranet.For more " "an alternative browser. This is often on the organization's "
"information on Internet Explorer's Enterprise Mode, see: " "intranet. For more information on Internet Explorer's Enterprise "
"Mode, see: "
"https://docs.microsoft.com/internet-explorer/ie11-deploy-guide" "https://docs.microsoft.com/internet-explorer/ie11-deploy-guide"
"/what-is-enterprise-mode" "/what-is-enterprise-mode"
trigger: trigger:
"This happens only once per profile, 60s after the first page " "1 minute after browser startup, and then refreshes every 30 "
"starts loading. The request may be retried once if it failed the " "minutes afterwards. Only happens if Legacy Browser Support is "
"first time." "enabled via enterprise policies."
data: data:
"Up to 2 (plus retries) HTTP or HTTPS GET requests to the URLs " "Up to 3 (plus retries) HTTP or HTTPS GET requests to the URLs "
"configured in Internet Explorer's SiteList policy, and Chrome's " "configured in Internet Explorer's SiteList policy, and Chrome's "
"BrowserSwitcherExternalSitelistUrl policy." "BrowserSwitcherExternalSitelistUrl and "
"BrowserSwitcherExternalGreylistUrl policies."
destination: OTHER destination: OTHER
destination_other: destination_other:
"URL configured in Internet Explorer's SiteList policy, and URL " "URL configured in Internet Explorer's SiteList policy, and URLs "
"configured in Chrome's BrowserSwitcherExternalSitelistUrl policy. " "configured in Chrome's BrowserSwitcherExternalSitelistUrl and "
"BrowserSwitcherExternalGreylistUrl policies."
} }
policy { policy {
cookies_allowed: NO cookies_allowed: NO
setting: "This feature cannot be disabled by settings." setting: "This feature cannot be disabled by settings."
policy_exception_justification: chrome_policy: {
"This feature still in development, and is disabled by default. " BrowserSwitcherEnabled: {
"It needs to be enabled through policies." BrowserSwitcherEnabled: false
}
}
})"); })");
} // namespace } // namespace
......
...@@ -29,7 +29,7 @@ Refer to README.md for content description and update process. ...@@ -29,7 +29,7 @@ Refer to README.md for content description and update process.
<item id="blob_reader" hash_code="5154306" type="0" deprecated="2018-06-14" content_hash_code="39702178" file_path=""/> <item id="blob_reader" hash_code="5154306" type="0" deprecated="2018-06-14" content_hash_code="39702178" file_path=""/>
<item id="bluetooth_socket" hash_code="94099818" type="0" content_hash_code="30932349" os_list="linux,windows" file_path="device/bluetooth/bluetooth_socket_net.cc"/> <item id="bluetooth_socket" hash_code="94099818" type="0" content_hash_code="30932349" os_list="linux,windows" file_path="device/bluetooth/bluetooth_socket_net.cc"/>
<item id="brandcode_config" hash_code="109679553" type="0" content_hash_code="128843792" os_list="linux,windows" file_path="chrome/browser/profile_resetter/brandcode_config_fetcher.cc"/> <item id="brandcode_config" hash_code="109679553" type="0" content_hash_code="128843792" os_list="linux,windows" file_path="chrome/browser/profile_resetter/brandcode_config_fetcher.cc"/>
<item id="browser_switcher_ieem_sitelist" hash_code="97159948" type="0" content_hash_code="40881413" os_list="linux,windows" file_path="chrome/browser/browser_switcher/browser_switcher_service.cc"/> <item id="browser_switcher_ieem_sitelist" hash_code="97159948" type="0" content_hash_code="129062966" os_list="linux,windows" file_path="chrome/browser/browser_switcher/browser_switcher_service.cc"/>
<item id="bundled_exchanges_start_url_loader" hash_code="105810794" type="0" content_hash_code="20630448" os_list="linux,windows" file_path="content/browser/web_package/bundled_exchanges_handle.cc"/> <item id="bundled_exchanges_start_url_loader" hash_code="105810794" type="0" content_hash_code="20630448" os_list="linux,windows" file_path="content/browser/web_package/bundled_exchanges_handle.cc"/>
<item id="captive_portal_service" hash_code="88754904" type="0" content_hash_code="70737580" os_list="linux,windows" file_path="chrome/browser/captive_portal/captive_portal_service.cc"/> <item id="captive_portal_service" hash_code="88754904" type="0" content_hash_code="70737580" os_list="linux,windows" file_path="chrome/browser/captive_portal/captive_portal_service.cc"/>
<item id="cast_channel_send" hash_code="103172229" type="0" deprecated="2018-08-23" content_hash_code="33946302" file_path=""/> <item id="cast_channel_send" hash_code="103172229" type="0" deprecated="2018-08-23" content_hash_code="33946302" file_path=""/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment