From 5258406e1dfe377c66509cace110465c1e6573ec Mon Sep 17 00:00:00 2001
From: "pastarmovj@chromium.org"
 <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 24 Jul 2012 08:46:13 +0000
Subject: Add a policy to disable mounting of external storage.

BUG=chromium-os:32338
TEST=unit tests. Manual testing can be done by setting the new policy in a DM server to true and verifying that external storage is not mount and shown in the file manager in Chrome.


Review URL: https://chromiumcodereview.appspot.com/10697097

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148065 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/generated_resources.grd      |  3 +++
 chrome/app/policy/policy_templates.json | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'chrome/app')

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cb45b18..5c25084 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -15257,6 +15257,9 @@ Battery full
       <message name="IDS_MULTIPART_DEVICE_UNSUPPORTED_DEFAULT_MESSAGE" desc="Text of notification message which is shown when user inserts removable device (SD card, USB key...)">
        Sorry, at least one partition on your external storage device could not be mounted.
       </message>
+      <message name="IDS_EXTERNAL_STORAGE_DISABLED_MESSAGE" desc="Text of notification message which is shown when user inserts removable device but external storage is disabled by policy">
+       Sorry, your administrator has disabled external storage on your account.
+      </message>
 
       <!-- Formatting device notifications -->
       <message name="IDS_FORMATTING_OF_DEVICE_PENDING_TITLE" desc="Text of notification message which is shown when formatting process of some device is pending">
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index d86bbf0..670b9eb 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -112,7 +112,7 @@
 #   persistent IDs for all fields (but not for groups!) are needed. These are
 #   specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
 #   because doing so would break the deployed wire format!
-#   For your editing convenience: highest ID currently used: 151
+#   For your editing convenience: highest ID currently used: 152
 #
 # Placeholders:
 #   The following placeholder strings are automatically substituted:
@@ -2756,6 +2756,22 @@
 
       If this setting is not configured then users can choose whether the spell checking service should be used or not.''',
     },
+    {
+      'name': 'ExternalStorageDisabled',
+      'type': 'main',
+      'supported_on': ['chrome_os:0.22-'],
+      'features': {'dynamic_refresh': True},
+      'example_value': True,
+      'id': 152,
+      'caption': '''Disable mounting of external storage''',
+      'desc': '''Disable mounting of external storage.
+
+      When this policy is set to true, external storage will not be available in the file browser.
+
+      This policy affects all types of storage media. For example: USB flash drives, external hard drives, SD and other memory cards, optical storage etc. Internal storage is not affected, therefore files saved in the Download folder can still be accessed. Google Drive is also not affected by this policy.
+
+      If this setting is disabled or not configured then users can use all supported types of external storage on their device.''',
+    },
   ],
   'messages': {
     # Messages that are not associated to any policies.
-- 
cgit v1.1