Commit 7af6c836 authored by Joel Hockey's avatar Joel Hockey Committed by Commit Bot

Always allow chrome://terminal since it is used for crosh

The TerminalSystemApp feature flag will still control
whether the new terminal app is shown, but we will always
allow chrome://terminal to serve content since it is now
used for crosh.

Bug: 1022250
Change-Id: I5feae6e4d6cfe5bf7fd830d27f55a343d390fb6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1924330
Auto-Submit: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: default avatarcalamity <calamity@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716927}
parent 01773ab7
...@@ -556,11 +556,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, ...@@ -556,11 +556,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<chromeos::smb_dialog::SmbShareDialogUI>; return &NewWebUI<chromeos::smb_dialog::SmbShareDialogUI>;
if (url.host_piece() == chrome::kChromeUISysInternalsHost) if (url.host_piece() == chrome::kChromeUISysInternalsHost)
return &NewWebUI<SysInternalsUI>; return &NewWebUI<SysInternalsUI>;
if (url.host_piece() == chrome::kChromeUITerminalHost) { if (url.host_piece() == chrome::kChromeUITerminalHost)
if (!base::FeatureList::IsEnabled(features::kTerminalSystemApp))
return nullptr;
return &NewWebUI<TerminalUI>; return &NewWebUI<TerminalUI>;
}
if (url.host_piece() == chrome::kChromeUIAssistantOptInHost) if (url.host_piece() == chrome::kChromeUIAssistantOptInHost)
return &NewWebUI<chromeos::AssistantOptInUI>; return &NewWebUI<chromeos::AssistantOptInUI>;
if (url.host_piece() == chrome::kChromeUICameraHost && if (url.host_piece() == chrome::kChromeUICameraHost &&
......
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