Commit 286bd49c authored by Stefan Teodorescu's avatar Stefan Teodorescu Committed by Commit Bot

Make management page unavailable on Android

The chrome://management page should only be available on desktop Chrome

Bug: 879146
Change-Id: I6ea0d54f1993bbf4875c7479f008eebed5bc3a32
Reviewed-on: https://chromium-review.googlesource.com/1233553Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Stefan Teodorescu <fane@google.com>
Cr-Commit-Position: refs/heads/master@{#592494}
parent c6955546
...@@ -402,10 +402,10 @@ ...@@ -402,10 +402,10 @@
<include name="IDR_POLICY_BASE_JS" file="resources\policy_base.js" type="BINDATA" compress="gzip" /> <include name="IDR_POLICY_BASE_JS" file="resources\policy_base.js" type="BINDATA" compress="gzip" />
<include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA" compress="gzip" /> <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA" compress="gzip" />
<include name="IDR_POLICY_COMMON_CSS" file="resources\policy_common.css" type="BINDATA" compress="gzip" /> <include name="IDR_POLICY_COMMON_CSS" file="resources\policy_common.css" type="BINDATA" compress="gzip" />
<include name="IDR_MANAGEMENT_HTML" file="resources\management.html" allowexternalscript="true" type="BINDATA" compress="gzip" />
<include name="IDR_MANAGEMENT_JS" file="resources\management.js" type="BINDATA" compress="gzip" />
<include name="IDR_MANAGEMENT_CSS" file="resources\management.css" type="BINDATA" compress="gzip" />
<if expr="not is_android"> <if expr="not is_android">
<include name="IDR_MANAGEMENT_HTML" file="resources\management.html" allowexternalscript="true" type="BINDATA" compress="gzip" />
<include name="IDR_MANAGEMENT_JS" file="resources\management.js" type="BINDATA" compress="gzip" />
<include name="IDR_MANAGEMENT_CSS" file="resources\management.css" type="BINDATA" compress="gzip" />
<include name="IDR_POLICY_TOOL_HTML" file="resources\policy_tool.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> <include name="IDR_POLICY_TOOL_HTML" file="resources\policy_tool.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
<include name="IDR_POLICY_TOOL_CSS" file="resources\policy_tool.css" type="BINDATA" compress="gzip" /> <include name="IDR_POLICY_TOOL_CSS" file="resources\policy_tool.css" type="BINDATA" compress="gzip" />
<include name="IDR_POLICY_TOOL_JS" file="resources\policy_tool.js" type="BINDATA" compress="gzip" /> <include name="IDR_POLICY_TOOL_JS" file="resources\policy_tool.js" type="BINDATA" compress="gzip" />
......
...@@ -710,10 +710,6 @@ jumbo_split_static_library("ui") { ...@@ -710,10 +710,6 @@ jumbo_split_static_library("ui") {
"webui/local_state/local_state_ui.h", "webui/local_state/local_state_ui.h",
"webui/log_web_ui_url.cc", "webui/log_web_ui_url.cc",
"webui/log_web_ui_url.h", "webui/log_web_ui_url.h",
"webui/management_ui.cc",
"webui/management_ui.h",
"webui/management_ui_handler.cc",
"webui/management_ui_handler.h",
"webui/media/media_engagement_ui.cc", "webui/media/media_engagement_ui.cc",
"webui/media/media_engagement_ui.h", "webui/media/media_engagement_ui.h",
"webui/media/webrtc_logs_ui.cc", "webui/media/webrtc_logs_ui.cc",
...@@ -1521,6 +1517,10 @@ jumbo_split_static_library("ui") { ...@@ -1521,6 +1517,10 @@ jumbo_split_static_library("ui") {
"webui/identity_internals_ui.h", "webui/identity_internals_ui.h",
"webui/inspect_ui.cc", "webui/inspect_ui.cc",
"webui/inspect_ui.h", "webui/inspect_ui.h",
"webui/management_ui.cc",
"webui/management_ui.h",
"webui/management_ui_handler.cc",
"webui/management_ui_handler.h",
"webui/md_bookmarks/bookmarks_message_handler.cc", "webui/md_bookmarks/bookmarks_message_handler.cc",
"webui/md_bookmarks/bookmarks_message_handler.h", "webui/md_bookmarks/bookmarks_message_handler.h",
"webui/md_bookmarks/md_bookmarks_ui.cc", "webui/md_bookmarks/md_bookmarks_ui.cc",
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "chrome/browser/ui/webui/invalidations_ui.h" #include "chrome/browser/ui/webui/invalidations_ui.h"
#include "chrome/browser/ui/webui/local_state/local_state_ui.h" #include "chrome/browser/ui/webui/local_state/local_state_ui.h"
#include "chrome/browser/ui/webui/log_web_ui_url.h" #include "chrome/browser/ui/webui/log_web_ui_url.h"
#include "chrome/browser/ui/webui/management_ui.h"
#include "chrome/browser/ui/webui/media/media_engagement_ui.h" #include "chrome/browser/ui/webui/media/media_engagement_ui.h"
#include "chrome/browser/ui/webui/media/webrtc_logs_ui.h" #include "chrome/browser/ui/webui/media/webrtc_logs_ui.h"
#include "chrome/browser/ui/webui/memory_internals_ui.h" #include "chrome/browser/ui/webui/memory_internals_ui.h"
...@@ -110,6 +109,7 @@ ...@@ -110,6 +109,7 @@
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
#include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/ui/webui/management_ui.h"
#include "chrome/browser/ui/webui/media_router/media_router_internals_ui.h" #include "chrome/browser/ui/webui/media_router/media_router_internals_ui.h"
#include "chrome/browser/ui/webui/media_router/media_router_ui.h" #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
#endif #endif
...@@ -380,8 +380,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, ...@@ -380,8 +380,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<InvalidationsUI>; return &NewWebUI<InvalidationsUI>;
if (url.host_piece() == chrome::kChromeUILocalStateHost) if (url.host_piece() == chrome::kChromeUILocalStateHost)
return &NewWebUI<LocalStateUI>; return &NewWebUI<LocalStateUI>;
if (url.host_piece() == chrome::kChromeUIManagementHost)
return &NewWebUI<ManagementUI>;
if (url.host_piece() == chrome::kChromeUIMemoryInternalsHost) if (url.host_piece() == chrome::kChromeUIMemoryInternalsHost)
return &NewWebUI<MemoryInternalsUI>; return &NewWebUI<MemoryInternalsUI>;
if (url.host_piece() == chrome::kChromeUINetExportHost) if (url.host_piece() == chrome::kChromeUINetExportHost)
...@@ -595,6 +593,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, ...@@ -595,6 +593,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
PolicyToolUI::IsEnabled()) { PolicyToolUI::IsEnabled()) {
return &NewWebUI<PolicyToolUI>; return &NewWebUI<PolicyToolUI>;
} }
if (url.host_piece() == chrome::kChromeUIManagementHost)
return &NewWebUI<ManagementUI>;
#endif #endif
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
......
...@@ -195,7 +195,6 @@ ...@@ -195,7 +195,6 @@
<part file="find_in_page_strings.grdp" /> <part file="find_in_page_strings.grdp" />
<part file="history_strings.grdp" /> <part file="history_strings.grdp" />
<part file="login_dialog_strings.grdp" /> <part file="login_dialog_strings.grdp" />
<part file="management_strings.grdp" />
<part file="new_or_sad_tab_strings.grdp" /> <part file="new_or_sad_tab_strings.grdp" />
<part file="nux_google_apps_strings.grdp" /> <part file="nux_google_apps_strings.grdp" />
<part file="nux_email_strings.grdp" /> <part file="nux_email_strings.grdp" />
...@@ -218,6 +217,10 @@ ...@@ -218,6 +217,10 @@
<part file="undo_strings.grdp" /> <part file="undo_strings.grdp" />
<part file="version_ui_strings.grdp" /> <part file="version_ui_strings.grdp" />
<if expr="not is_android and not is_ios">
<part file="management_strings.grdp" />
</if>
<!-- Generic terms --> <!-- Generic terms -->
<message name="IDS_CANCEL" desc="Used for Cancel on buttons"> <message name="IDS_CANCEL" desc="Used for Cancel on buttons">
Cancel Cancel
......
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