Commit fffdc519 authored by Joel Hockey's avatar Joel Hockey Committed by Commit Bot

Fix FilesApp PluginVm sharing labels

Bug: 957477
Change-Id: Iadf051e96bb9f493edf4c048ca642a7794c6b48e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636656
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664650}
parent 456f3058
...@@ -1810,10 +1810,10 @@ CommandHandler.COMMANDS_['share-with-plugin-vm'] = new class extends Command { ...@@ -1810,10 +1810,10 @@ CommandHandler.COMMANDS_['share-with-plugin-vm'] = new class extends Command {
// Register the share and show the 'Manage PluginVM sharing' toast // Register the share and show the 'Manage PluginVM sharing' toast
// immediately, since the container may take 10s or more to start. // immediately, since the container may take 10s or more to start.
fileManager.crostini.registerSharedPath(constants.PLUGIN_VM, dir); fileManager.crostini.registerSharedPath(constants.PLUGIN_VM, dir);
fileManager.ui.toast.show(str('FOLDER_SHARED_WITH_CROSTINI'), { fileManager.ui.toast.show(str('FOLDER_SHARED_WITH_PLUGIN_VM'), {
text: str('MANAGE_LINUX_SHARING_BUTTON_LABEL'), text: str('MANAGE_PLUGIN_VM_SHARING_BUTTON_LABEL'),
callback: () => { callback: () => {
chrome.fileManagerPrivate.openSettingsSubpage('pluginvm/sharedPaths'); chrome.fileManagerPrivate.openSettingsSubpage('pluginVm/sharedPaths');
CommandHandler.recordMenuItemSelected( CommandHandler.recordMenuItemSelected(
CommandHandler.MenuCommandsForUMA.MANAGE_PLUGIN_VM_SHARING_TOAST); CommandHandler.MenuCommandsForUMA.MANAGE_PLUGIN_VM_SHARING_TOAST);
} }
...@@ -1906,7 +1906,7 @@ CommandHandler.COMMANDS_['manage-linux-sharing'] = new class extends Command { ...@@ -1906,7 +1906,7 @@ CommandHandler.COMMANDS_['manage-linux-sharing'] = new class extends Command {
CommandHandler.COMMANDS_['manage-plugin-vm-sharing-gear'] = CommandHandler.COMMANDS_['manage-plugin-vm-sharing-gear'] =
new class extends Command { new class extends Command {
execute(event, fileManager) { execute(event, fileManager) {
chrome.fileManagerPrivate.openSettingsSubpage('pluginvm/sharedPaths'); chrome.fileManagerPrivate.openSettingsSubpage('pluginVm/sharedPaths');
CommandHandler.recordMenuItemSelected( CommandHandler.recordMenuItemSelected(
CommandHandler.MenuCommandsForUMA.MANAGE_PLUGIN_VM_SHARING); CommandHandler.MenuCommandsForUMA.MANAGE_PLUGIN_VM_SHARING);
} }
...@@ -1925,7 +1925,7 @@ CommandHandler.COMMANDS_['manage-plugin-vm-sharing-gear'] = ...@@ -1925,7 +1925,7 @@ CommandHandler.COMMANDS_['manage-plugin-vm-sharing-gear'] =
CommandHandler.COMMANDS_['manage-plugin-vm-sharing'] = CommandHandler.COMMANDS_['manage-plugin-vm-sharing'] =
new class extends Command { new class extends Command {
execute(event, fileManager) { execute(event, fileManager) {
chrome.fileManagerPrivate.openSettingsSubpage('pluginvm/sharedPaths'); chrome.fileManagerPrivate.openSettingsSubpage('pluginVm/sharedPaths');
CommandHandler.recordMenuItemSelected( CommandHandler.recordMenuItemSelected(
CommandHandler.MenuCommandsForUMA.MANAGE_PLUGIN_VM_SHARING); CommandHandler.MenuCommandsForUMA.MANAGE_PLUGIN_VM_SHARING);
} }
......
...@@ -6,11 +6,15 @@ const shareBase = { ...@@ -6,11 +6,15 @@ const shareBase = {
// Params for 'Share with Linux'. // Params for 'Share with Linux'.
vmNameTermina: 'termina', vmNameTermina: 'termina',
vmNameSelectorLinux: 'linux', vmNameSelectorLinux: 'linux',
toastSharedTextLinux: '1 folder shared with Linux',
toastActionTextLinux: 'Manage Linux sharing',
enumUmaShareWithLinux: 12, enumUmaShareWithLinux: 12,
enumUmaManageLinuxSharing: 13, enumUmaManageLinuxSharing: 13,
// Params for 'Share with Plugin VM'. // Params for 'Share with Plugin VM'.
vmNamePluginVm: 'PvmDefault', vmNamePluginVm: 'PvmDefault',
vmNameSelectorPluginVm: 'plugin-vm', vmNameSelectorPluginVm: 'plugin-vm',
toastSharedTextPluginVm: '1 folder shared with Plugin VM',
toastActionTextPluginVm: 'Manage Plugin VM sharing',
enumUmaShareWithPluginVm: 16, enumUmaShareWithPluginVm: 16,
enumUmaManagePluginVmSharing: 17, enumUmaManagePluginVmSharing: 17,
}; };
...@@ -41,7 +45,9 @@ shareBase.verifyShareWithDialog = ...@@ -41,7 +45,9 @@ shareBase.verifyShareWithDialog =
await test.waitForElementLost(dialog); await test.waitForElementLost(dialog);
}; };
shareBase.testSharePaths = async (vmName, vmNameSelector, enumUma, done) => { shareBase.testSharePaths = async (
vmName, vmNameSelector, toastSharedText, toastActionText, enumUma,
done) => {
const share = 'share-with-' + vmNameSelector; const share = 'share-with-' + vmNameSelector;
const manage = 'manage-' + vmNameSelector + '-sharing'; const manage = 'manage-' + vmNameSelector + '-sharing';
const menuNoShareWith = '#file-context-menu:not([hidden]) ' + const menuNoShareWith = '#file-context-menu:not([hidden]) ' +
...@@ -114,6 +120,16 @@ shareBase.testSharePaths = async (vmName, vmNameSelector, enumUma, done) => { ...@@ -114,6 +120,16 @@ shareBase.testSharePaths = async (vmName, vmNameSelector, enumUma, done) => {
'#container:not([hidden])') || '#container:not([hidden])') ||
test.pending('wait for toast'); test.pending('wait for toast');
}); });
assertEquals(
document.querySelector('#toast')
.shadowRoot.querySelector('#text')
.innerText,
toastSharedText);
assertEquals(
document.querySelector('#toast')
.shadowRoot.querySelector('#action')
.innerText,
toastActionText);
// Right-click 'photos' directory. // Right-click 'photos' directory.
// Check 'Share with <VM>' is not shown in menu. // Check 'Share with <VM>' is not shown in menu.
...@@ -247,12 +263,14 @@ shareBase.testSharePaths = async (vmName, vmNameSelector, enumUma, done) => { ...@@ -247,12 +263,14 @@ shareBase.testSharePaths = async (vmName, vmNameSelector, enumUma, done) => {
crostiniShare.testSharePaths = done => { crostiniShare.testSharePaths = done => {
shareBase.testSharePaths( shareBase.testSharePaths(
shareBase.vmNameTermina, shareBase.vmNameSelectorLinux, shareBase.vmNameTermina, shareBase.vmNameSelectorLinux,
shareBase.toastSharedTextLinux, shareBase.toastActionTextLinux,
shareBase.enumUmaShareWithLinux, done); shareBase.enumUmaShareWithLinux, done);
}; };
pluginVmShare.testSharePaths = done => { pluginVmShare.testSharePaths = done => {
shareBase.testSharePaths( shareBase.testSharePaths(
shareBase.vmNamePluginVm, shareBase.vmNameSelectorPluginVm, shareBase.vmNamePluginVm, shareBase.vmNameSelectorPluginVm,
shareBase.toastSharedTextPluginVm, shareBase.toastActionTextPluginVm,
shareBase.enumUmaShareWithPluginVm, done); shareBase.enumUmaShareWithPluginVm, done);
}; };
......
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