Commit 5b302b47 authored by Timothy Loh's avatar Timothy Loh Committed by Commit Bot

Fix routing for Plugin VM OS settings pages

This CL fixes the routing for the OS settings pages pluginVm/details
and pluginVm/sharedPaths, which the File Manager relies on.

Bug: b:152708714
Change-Id: Id5bb0272c70dbf4097bbb675d897dd22af830e10
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2129453Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarSam McNally <sammc@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Timothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755151}
parent 350bcac7
......@@ -112,6 +112,8 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
chrome::kManageAccessibilityTtsSubPage},
{ChromePage::MULTIDEVICE, chrome::kMultideviceSubPage},
{ChromePage::NETWORKSTYPEVPN, chrome::kVPNSettingsSubPage},
{ChromePage::PLUGINVMDETAILS, chrome::kPluginVmDetailsSubPage},
{ChromePage::PLUGINVMSHAREDPATHS, chrome::kPluginVmSharedPathsSubPage},
{ChromePage::POINTEROVERLAY, chrome::kPointerOverlaySubPage},
{ChromePage::POWER, chrome::kPowerSubPage},
{ChromePage::RESET, chrome::kResetSubPage},
......
......@@ -318,6 +318,10 @@ void TestAllOSSettingPages(const GURL& base_url) {
base_url.Resolve(chrome::kKnownNetworksSubPage));
TestOpenChromePage(ChromePage::MANAGEACCESSIBILITYTTS,
base_url.Resolve(chrome::kManageAccessibilityTtsSubPage));
TestOpenChromePage(ChromePage::PLUGINVMDETAILS,
base_url.Resolve(chrome::kPluginVmDetailsSubPage));
TestOpenChromePage(ChromePage::PLUGINVMSHAREDPATHS,
base_url.Resolve(chrome::kPluginVmSharedPathsSubPage));
TestOpenChromePage(ChromePage::SMARTLOCKSETTINGS,
base_url.Resolve(chrome::kSmartLockSettingsSubPage));
TestOpenChromePage(ChromePage::STYLUS,
......
......@@ -478,6 +478,8 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
kNativePrintingSettingsSubPage,
kNetworkDetailSubPage,
kNetworksSubPage,
kPluginVmDetailsSubPage,
kPluginVmSharedPathsSubPage,
kPointerOverlaySubPage,
kPowerSubPage,
// reset is both an OS and browser sub page, but prefer the OS version
......
......@@ -171,8 +171,10 @@ enum ChromePage {
ETHERNET,
CELLULAR,
AMBIENTMODE,
PLUGINVMDETAILS,
PLUGINVMSHAREDPATHS,
LAST = AMBIENTMODE,
LAST = PLUGINVMSHAREDPATHS,
};
// Describes an unique chrome app.
......
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