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

Rename 'Linux Files' to 'Linux files'

Bug: 873025
Change-Id: Ibbf85f4a9645f0e4bde132ae39e541416c6a4073
Reviewed-on: https://chromium-review.googlesource.com/1170154Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582050}
parent 6cc01a5b
...@@ -373,8 +373,8 @@ ...@@ -373,8 +373,8 @@
<message name="IDS_FILE_BROWSER_ERROR_EXTERNAL_DRIVE_LONG_NAME" desc="Error message displayed when user tries to enter too long name for an external drive."> <message name="IDS_FILE_BROWSER_ERROR_EXTERNAL_DRIVE_LONG_NAME" desc="Error message displayed when user tries to enter too long name for an external drive.">
Use a name that's <ph name="MAX_LENGTH">$1<ex>11</ex></ph> characters or less Use a name that's <ph name="MAX_LENGTH">$1<ex>11</ex></ph> characters or less
</message> </message>
<message name="IDS_FILE_BROWSER_ERROR_LINUX_FILES_CONNECTION" desc="Text to show user when there is an error starting or mounting crostini container to show Linux Files."> <message name="IDS_FILE_BROWSER_ERROR_LINUX_FILES_CONNECTION" desc="Text to show user when there is an error starting or mounting crostini container to show Linux files.">
Unable to view Linux Files Unable to view Linux files
</message> </message>
<message name="IDS_FILE_BROWSER_EMPTY_FOLDER" desc="Label shown in an empty folder."> <message name="IDS_FILE_BROWSER_EMPTY_FOLDER" desc="Label shown in an empty folder.">
...@@ -974,8 +974,8 @@ ...@@ -974,8 +974,8 @@
<message name="IDS_FILE_BROWSER_DROP_TARGET_FOLDER_NO_MOVE_PERMISSION" desc="Tooltip label displayed besides mouse pointer while dragging files or folders over a Team Drive or folder in Drive that does not have write access."> <message name="IDS_FILE_BROWSER_DROP_TARGET_FOLDER_NO_MOVE_PERMISSION" desc="Tooltip label displayed besides mouse pointer while dragging files or folders over a Team Drive or folder in Drive that does not have write access.">
You don't have permission to move files into '<ph name="FOLDER_NAME">$1<ex>Trip Photos</ex></ph>'. You don't have permission to move files into '<ph name="FOLDER_NAME">$1<ex>Trip Photos</ex></ph>'.
</message> </message>
<message name="IDS_FILE_BROWSER_DROP_TARGET_OPENING_LINUX_FILES" desc="Tooltip label displayed besides mouse pointer when dragging files or folders over Linux Files root before the container has been started and mounted."> <message name="IDS_FILE_BROWSER_DROP_TARGET_OPENING_LINUX_FILES" desc="Tooltip label displayed besides mouse pointer when dragging files or folders over Linux files root before the container has been started and mounted.">
Opening Linux Files... Opening Linux files...
</message> </message>
<message name="IDS_FILE_BROWSER_SELECT_FOLDER_TITLE" desc="Select folder title."> <message name="IDS_FILE_BROWSER_SELECT_FOLDER_TITLE" desc="Select folder title.">
...@@ -1231,7 +1231,7 @@ ...@@ -1231,7 +1231,7 @@
Unable to open with $1 Unable to open with $1
</message> </message>
<message name="IDS_FILE_BROWSER_UNABLE_TO_OPEN_CROSTINI" desc="Message shown when a user tries to use a crostini app to open a file outside the crostini container (e.g. in Downloads). This message will be removed once we support this action."> <message name="IDS_FILE_BROWSER_UNABLE_TO_OPEN_CROSTINI" desc="Message shown when a user tries to use a crostini app to open a file outside the crostini container (e.g. in Downloads). This message will be removed once we support this action.">
To open files with $1, first copy to Linux Files folder. To open files with $1, first copy to Linux files folder.
</message> </message>
<message name="IDS_FILE_BROWSER_FOLDER" desc="Folder entry type"> <message name="IDS_FILE_BROWSER_FOLDER" desc="Folder entry type">
...@@ -5112,7 +5112,7 @@ ...@@ -5112,7 +5112,7 @@
Delete Linux (Beta) Delete Linux (Beta)
</message> </message>
<message name="IDS_CROSTINI_UNINSTALLER_BODY" desc="Description for the Crostini uninstaller, a dialog for uninstalling Linux, the associated VM and Linux files."> <message name="IDS_CROSTINI_UNINSTALLER_BODY" desc="Description for the Crostini uninstaller, a dialog for uninstalling Linux, the associated VM and Linux files.">
Delete all Linux applications and data in your Linux Files folder from this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>? Delete all Linux applications and data in your Linux files folder from this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>?
</message> </message>
<message name="IDS_CROSTINI_UNINSTALLER_UNINSTALL_BUTTON" desc="Label for the button in the Crostini uninstaller dialog to uninstall Linux"> <message name="IDS_CROSTINI_UNINSTALLER_UNINSTALL_BUTTON" desc="Label for the button in the Crostini uninstaller dialog to uninstall Linux">
Delete Delete
......
...@@ -459,7 +459,7 @@ class DownloadsTestVolume : public LocalTestVolume { ...@@ -459,7 +459,7 @@ class DownloadsTestVolume : public LocalTestVolume {
DISALLOW_COPY_AND_ASSIGN(DownloadsTestVolume); DISALLOW_COPY_AND_ASSIGN(DownloadsTestVolume);
}; };
// CrostiniTestVolume: local test volume for the "Linux Files" directory. // CrostiniTestVolume: local test volume for the "Linux files" directory.
class CrostiniTestVolume : public LocalTestVolume { class CrostiniTestVolume : public LocalTestVolume {
public: public:
CrostiniTestVolume() : LocalTestVolume("Crostini") {} CrostiniTestVolume() : LocalTestVolume("Crostini") {}
......
...@@ -46,13 +46,13 @@ bool MigratePathFromOldFormat(Profile* profile, ...@@ -46,13 +46,13 @@ bool MigratePathFromOldFormat(Profile* profile,
// The canonical mount point name for "Downloads" folder. // The canonical mount point name for "Downloads" folder.
std::string GetDownloadsMountPointName(Profile* profile); std::string GetDownloadsMountPointName(Profile* profile);
// The canonical mount point name for crostini "Linux Files" folder. // The canonical mount point name for crostini "Linux files" folder.
std::string GetCrostiniMountPointName(Profile* profile); std::string GetCrostiniMountPointName(Profile* profile);
// The actual directory the crostini "Linux Files" folder is mounted. // The actual directory the crostini "Linux files" folder is mounted.
base::FilePath GetCrostiniMountDirectory(Profile* profile); base::FilePath GetCrostiniMountDirectory(Profile* profile);
// The sshfs mount options for crostini "Linux Files" mount. // The sshfs mount options for crostini "Linux files" mount.
std::vector<std::string> GetCrostiniMountOptions( std::vector<std::string> GetCrostiniMountOptions(
const std::string& hostname, const std::string& hostname,
const std::string& host_private_key, const std::string& host_private_key,
......
...@@ -103,7 +103,7 @@ VolumeManagerCommon.RootType = { ...@@ -103,7 +103,7 @@ VolumeManagerCommon.RootType = {
// 'Add new services' menu item. // 'Add new services' menu item.
ADD_NEW_SERVICES_MENU: 'add_new_services_menu', ADD_NEW_SERVICES_MENU: 'add_new_services_menu',
// Root for crostini 'Linux Files'. // Root for crostini 'Linux files'.
CROSTINI: 'crostini', CROSTINI: 'crostini',
// Root for android files. // Root for android files.
......
...@@ -159,7 +159,7 @@ NavigationModelMenuItem.prototype = /** @struct */ { ...@@ -159,7 +159,7 @@ NavigationModelMenuItem.prototype = /** @struct */ {
}; };
/** /**
* Item of NavigationListModel for a fake item such as Recent or Linux Files. * Item of NavigationListModel for a fake item such as Recent or Linux files.
* *
* @param {string} label Label on the menu button. * @param {string} label Label on the menu button.
* @param {NavigationModelItemType} type * @param {NavigationModelItemType} type
...@@ -217,7 +217,7 @@ function NavigationListModel( ...@@ -217,7 +217,7 @@ function NavigationListModel(
this.recentModelItem_ = recentModelItem; this.recentModelItem_ = recentModelItem;
/** /**
* Root folder for crostini Linux Files. * Root folder for crostini Linux files.
* This field will be set asynchronously after calling * This field will be set asynchronously after calling
* chrome.fileManagerPrivate.isCrostiniEnabled. * chrome.fileManagerPrivate.isCrostiniEnabled.
* @private {NavigationModelFakeItem} * @private {NavigationModelFakeItem}
...@@ -419,10 +419,10 @@ NavigationListModel.prototype = { ...@@ -419,10 +419,10 @@ NavigationListModel.prototype = {
return this.shortcutList_; return this.shortcutList_;
}, },
/** /**
* Set the crostini Linux Files root and reorder items. * Set the crostini Linux files root and reorder items.
* This setter is provided separate to the constructor since * This setter is provided separate to the constructor since
* this field is set async after calling fileManagerPrivate.isCrostiniEnabled. * this field is set async after calling fileManagerPrivate.isCrostiniEnabled.
* @param {NavigationModelFakeItem} item Linux Files root. * @param {NavigationModelFakeItem} item Linux files root.
*/ */
set linuxFilesItem(item) { set linuxFilesItem(item) {
this.linuxFilesItem_ = item; this.linuxFilesItem_ = item;
...@@ -437,7 +437,7 @@ NavigationListModel.prototype = { ...@@ -437,7 +437,7 @@ NavigationListModel.prototype = {
/** /**
* Reorder navigation items when command line flag new-files-app-navigation is * Reorder navigation items when command line flag new-files-app-navigation is
* enabled it nests Downloads, Linux and Android files under "My Files"; when * enabled it nests Downloads, Linux and Android files under "My Files"; when
* it's disabled it has a flat structure with Linux Files after Recent menu. * it's disabled it has a flat structure with Linux files after Recent menu.
*/ */
NavigationListModel.prototype.reorderNavigationItems_ = function() { NavigationListModel.prototype.reorderNavigationItems_ = function() {
if (!this.disableMyFilesNavigation_) { if (!this.disableMyFilesNavigation_) {
...@@ -452,7 +452,7 @@ NavigationListModel.prototype.reorderNavigationItems_ = function() { ...@@ -452,7 +452,7 @@ NavigationListModel.prototype.reorderNavigationItems_ = function() {
* 1. Volumes. * 1. Volumes.
* 2. If Downloads exists, then immediately after Downloads should be: * 2. If Downloads exists, then immediately after Downloads should be:
* 2a. Recent if it exists. * 2a. Recent if it exists.
* 2b. Linux Files if it exists and is not mounted. * 2b. Linux files if it exists and is not mounted.
* When mounted, it will be located in Volumes at this position. * When mounted, it will be located in Volumes at this position.
* 3. Shortcuts. * 3. Shortcuts.
* 4. Add new services if it exists. * 4. Add new services if it exists.
......
...@@ -1360,7 +1360,7 @@ MenuItem.prototype.activate = function() { ...@@ -1360,7 +1360,7 @@ MenuItem.prototype.activate = function() {
// FakeItem // FakeItem
/** /**
* FakeItem is used by Recent and Linux Files. * FakeItem is used by Recent and Linux files.
* @param {!VolumeManagerCommon.RootType} rootType root type. * @param {!VolumeManagerCommon.RootType} rootType root type.
* @param {!NavigationModelFakeItem} modelItem * @param {!NavigationModelFakeItem} modelItem
* @param {!DirectoryTree} tree Current tree, which contains this item. * @param {!DirectoryTree} tree Current tree, which contains this item.
......
...@@ -27,12 +27,12 @@ crostini.testCrostiniSuccess = (done) => { ...@@ -27,12 +27,12 @@ crostini.testCrostiniSuccess = (done) => {
}; };
test.setupAndWaitUntilReady() test.setupAndWaitUntilReady()
.then(() => { .then(() => {
// Linux Files fake root is shown. // Linux files fake root is shown.
return test.waitForElement( return test.waitForElement(
'#directory-tree .tree-item [root-type-icon="crostini"]'); '#directory-tree .tree-item [root-type-icon="crostini"]');
}) })
.then(() => { .then(() => {
// Click on Linux Files. // Click on Linux files.
assertTrue( assertTrue(
test.fakeMouseClick( test.fakeMouseClick(
'#directory-tree .tree-item [root-type-icon="crostini"]'), '#directory-tree .tree-item [root-type-icon="crostini"]'),
......
...@@ -20,7 +20,7 @@ testcase.mountCrostiniContainer = function() { ...@@ -20,7 +20,7 @@ testcase.mountCrostiniContainer = function() {
addEntries(['crostini'], BASIC_CROSTINI_ENTRY_SET, this.next); addEntries(['crostini'], BASIC_CROSTINI_ENTRY_SET, this.next);
}, },
function() { function() {
// Linux Files fake root is shown. // Linux files fake root is shown.
remoteCall.waitForElement(appId, fake).then(this.next); remoteCall.waitForElement(appId, fake).then(this.next);
}, },
function() { function() {
......
...@@ -23,7 +23,7 @@ testcase.installLinuxPackageDialog = function() { ...@@ -23,7 +23,7 @@ testcase.installLinuxPackageDialog = function() {
appId = results.windowId; appId = results.windowId;
addEntries(['crostini'], [ENTRIES.debPackage], this.next); addEntries(['crostini'], [ENTRIES.debPackage], this.next);
}, },
// Linux Files fake root is shown. // Linux files fake root is shown.
function() { function() {
remoteCall.waitForElement(appId, fake).then(this.next); remoteCall.waitForElement(appId, fake).then(this.next);
}, },
......
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