Add policy to show a logout button in the ash system tray

This CL adds a policy that, when enabled, adds a big, red logout button
to the ash system tray.

BUG=152929


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169337 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 29 insertions, 1 deletions

diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index a6c0a1a..c09e4f6 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: 163
+#   For your editing convenience: highest ID currently used: 164
 #
 # Placeholders:
 #   The following placeholder strings are automatically substituted:
@@ -3284,6 +3284,23 @@
 
       The format of the value follows the names of timezones in the "IANA Time Zone Database" (see "http://en.wikipedia.org/wiki/List_of_tz_database_time"). In particular, most timezones can be referred to by "continent/large_city" or "ocean/large_city".''',
     },
+    {
+      'name': 'ShowLogoutButtonInTray',
+      'type': 'main',
+      'schema': { 'type': 'boolean' },
+      'supported_on': ['chrome_os:25-'],
+      'features': {
+        'dynamic_refresh': True,
+      },
+      'example_value': True,
+      'id': 164,
+      'caption': '''Add a logout button to the ash system tray''',
+      'desc': '''Adds a logout button to the ash system tray.
+
+      If enabled, a big, red logout button is shown in the ash system tray while a session is active and the screen is not locked.
+
+      If disabled or not specified, no big, red logout button is shown in the ash system tray.''',
+    },
   ],
   'messages': {
     # Messages that are not associated to any policies.
diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc
index 768cc81..f5c1423 100644
--- a/chrome/browser/policy/configuration_policy_handler_list.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list.cc
@@ -329,6 +329,9 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kAudioCaptureAllowed,
     prefs::kAudioCaptureAllowed,
     Value::TYPE_BOOLEAN },
+  { key::kShowLogoutButtonInTray,
+    prefs::kShowLogoutButtonInTray,
+    Value::TYPE_BOOLEAN },
 #endif  // defined(OS_CHROMEOS)
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index a6941d2..475e84e 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -1477,6 +1477,14 @@
     ]
   },
 
+  "ShowLogoutButtonInTray": {
+    "os": ["chromeos"],
+    "test_policy": { "ShowLogoutButtonInTray": true },
+    "pref_mappings": [
+      { "pref": "show_logout_button_in_tray" }
+    ]
+  },
+
   "----- Chrome OS device policies ---------------------------------------": {},
 
   "DevicePolicyRefreshRate": {