Add the protobufs for the set of session timeout policies planned for the kiosk mode.

chrome/browser/chromeos/device_settings_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/device_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 27 matching lines @@
 
 // List of settings handled by the DeviceSettingsProvider.
 const char* kKnownSettings[] = {
   kAccountsPrefAllowGuest,
   kAccountsPrefAllowNewUser,
   kAccountsPrefEphemeralUsersEnabled,
   kAccountsPrefShowUserNamesOnSignIn,
   kAccountsPrefUsers,
   kAppPack,
   kDeviceOwner,
+  kIdleLogoutTimeout,
+  kIdleLogoutWarningDuration,
   kReleaseChannel,
   kReportDeviceActivityTimes,
   kReportDeviceBootMode,
   kReportDeviceVersionInfo,
+  kScreenSaverExtensionId,
+  kScreenSaverTimeout,
   kSettingProxyEverywhere,
   kSignedDataRoamingEnabled,
   kStatsReportingPref,
 };
 
 // Upper bound for number of retries to fetch a signed setting.
 static const int kNumRetriesLimit = 9;
 
 // Legacy policy file location. Used to detect migration from pre v12 ChromeOS.
 const char kLegacyPolicyFile[] = "/var/lib/whitelist/preferences";
@@ skipping 206 matching lines @@
     em::EphemeralUsersEnabledProto* ephemeral_users_enabled =
         pol.mutable_ephemeral_users_enabled();
     bool ephemeral_users_enabled_value = false;
     if (value->GetAsBoolean(&ephemeral_users_enabled_value))
       ephemeral_users_enabled->set_ephemeral_users_enabled(
           ephemeral_users_enabled_value);
     else
       NOTREACHED();
   } else {
     // The remaining settings don't support Set(), since they are not
-    // intended to be customizable by the user:
+    // intended to be customizable by the user yet:

[Mattias Nissler (ping if slow), 2012/03/01 19:58:10]

The yet is not accurate. Put it in parens at least.

[pastarmovj, 2012/03/05 17:02:55]

Done.

     //   kAppPack
+    //   kIdleLogoutTimeout,
+    //   kIdleLogoutWarningDuration,
     //   kReportDeviceVersionInfo
     //   kReportDeviceActivityTimes
     //   kReportDeviceBootMode
+    //   kScreenSaverExtensionId,
+    //   kScreenSaverTimeout,
+
     NOTREACHED();
   }
   data.set_policy_value(pol.SerializeAsString());
   // Set the cache to the updated value.
   policy_ = data;
   UpdateValuesCache();
 
   if (!signed_settings_cache::Store(data, g_browser_process->local_state()))
     LOG(ERROR) << "Couldn't store to the temp storage.";
 
@@ skipping 32 matching lines @@
 void DeviceSettingsProvider::UpdateValuesCache() {
   const em::PolicyData data = policy();
   PrefValueMap new_values_cache;
 
   if (data.has_username() && !data.has_request_token())
     new_values_cache.SetString(kDeviceOwner, data.username());
 
   em::ChromeDeviceSettingsProto pol;
   pol.ParseFromString(data.policy_value());
 
+  // --------------------
+  // Boolean Policies
+  // --------------------

[Mattias Nissler (ping if slow), 2012/03/01 19:58:10]

Instead of doing this, how about actually breaking the code up into functions?
Even better, maybe break it into logical groups instead of by type?

[pastarmovj, 2012/03/05 17:02:55]

Done.

+
   // For all our boolean settings the following is applicable:
   // true is default permissive value and false is safe prohibitive value.
   // Exceptions:
   //   kSignedDataRoamingEnabled has a default value of false.
   //   kAccountsPrefEphemeralUsersEnabled has a default value of false.
   if (pol.has_allow_new_users() &&
       pol.allow_new_users().has_allow_new_users() &&
       pol.allow_new_users().allow_new_users()) {
     // New users allowed, user_whitelist() ignored.
     new_values_cache.SetBoolean(kAccountsPrefAllowNewUser, true);
@@ skipping 26 matching lines @@
       pol.has_data_roaming_enabled() &&
       pol.data_roaming_enabled().has_data_roaming_enabled() &&
       pol.data_roaming_enabled().data_roaming_enabled());
 
   new_values_cache.SetBoolean(
       kAccountsPrefEphemeralUsersEnabled,
       pol.has_ephemeral_users_enabled() &&
       pol.ephemeral_users_enabled().has_ephemeral_users_enabled() &&
       pol.ephemeral_users_enabled().ephemeral_users_enabled());
 
+  if (pol.has_device_reporting()) {
+    if (pol.device_reporting().has_report_version_info()) {
+      new_values_cache.SetBoolean(kReportDeviceVersionInfo,
+          pol.device_reporting().report_version_info());
+    }
+    // TODO(dubroy): Re-add device activity time policy here when the UI
+    // to notify the user has been implemented (http://crosbug.com/26252).
+    if (pol.device_reporting().has_report_boot_mode()) {
+      new_values_cache.SetBoolean(kReportDeviceBootMode,
+          pol.device_reporting().report_boot_mode());
+    }
+  }
+
+  if (pol.has_metrics_enabled()) {
+    new_values_cache.SetBoolean(kStatsReportingPref,
+                                pol.metrics_enabled().metrics_enabled());
+  } else {
+    new_values_cache.SetBoolean(kStatsReportingPref, HasOldMetricsFile());
+  }
+
+  // --------------------
+  // Integer Policies
+  // --------------------
+
+  if (pol.has_screen_saver() &&
+      pol.screen_saver().has_screen_saver_timeout()) {
+    new_values_cache.SetInteger(kScreenSaverTimeout,
+                                pol.screen_saver().screen_saver_timeout());
+  }
+
+  if (pol.has_forced_logout_timeouts() &&
+      pol.forced_logout_timeouts().has_idle_logout_timeout()) {
+    new_values_cache.SetInteger(
+        kIdleLogoutTimeout,
+        pol.forced_logout_timeouts().idle_logout_timeout());
+  }
+
+  if (pol.has_forced_logout_timeouts() &&
+      pol.forced_logout_timeouts().has_idle_logout_warning_duration()) {
+    new_values_cache.SetInteger(
+        kIdleLogoutWarningDuration,
+        pol.forced_logout_timeouts().idle_logout_warning_duration());
+  }
+
+  // --------------------
+  // String Policies
+  // --------------------
+
   // TODO(cmasone): NOTIMPLEMENTED() once http://crosbug.com/13052 is fixed.
   std::string serialized;
   if (pol.has_device_proxy_settings() &&
       pol.device_proxy_settings().SerializeToString(&serialized)) {
     new_values_cache.SetString(kSettingProxyEverywhere, serialized);
   }
 
   if (!pol.has_release_channel() ||
       !pol.release_channel().has_release_channel()) {
     // Default to an invalid channel (will be ignored).
     new_values_cache.SetString(kReleaseChannel, "");
   } else {
     new_values_cache.SetString(kReleaseChannel,
                                pol.release_channel().release_channel());
   }
 
-  if (pol.has_metrics_enabled()) {
-    new_values_cache.SetBoolean(kStatsReportingPref,
-                                pol.metrics_enabled().metrics_enabled());
-  } else {
-    new_values_cache.SetBoolean(kStatsReportingPref, HasOldMetricsFile());
+  if (pol.has_screen_saver() &&
+      pol.screen_saver().has_screen_saver_extension_id()) {
+    new_values_cache.SetString(kScreenSaverExtensionId,
+                               pol.screen_saver().screen_saver_extension_id());
   }
 
+  // --------------------
+  // List Policies
+  // --------------------
   base::ListValue* list = new base::ListValue();
   const em::UserWhitelistProto& whitelist_proto = pol.user_whitelist();
   const RepeatedPtrField<std::string>& whitelist =
       whitelist_proto.user_whitelist();
   for (RepeatedPtrField<std::string>::const_iterator it = whitelist.begin();
        it != whitelist.end(); ++it) {
     list->Append(base::Value::CreateStringValue(*it));
   }
   new_values_cache.SetValue(kAccountsPrefUsers, list);
 
-  if (pol.has_device_reporting()) {
-    if (pol.device_reporting().has_report_version_info()) {
-      new_values_cache.SetBoolean(kReportDeviceVersionInfo,
-          pol.device_reporting().report_version_info());
-    }
-    // TODO(dubroy): Re-add device activity time policy here when the UI
-    // to notify the user has been implemented (http://crosbug.com/26252).
-    if (pol.device_reporting().has_report_boot_mode()) {
-      new_values_cache.SetBoolean(kReportDeviceBootMode,
-          pol.device_reporting().report_boot_mode());
-    }
-  }
-
   if (pol.has_app_pack()) {
     typedef RepeatedPtrField<em::AppPackEntryProto> proto_type;
     base::ListValue* list = new base::ListValue;
     const proto_type& app_pack = pol.app_pack().app_pack();
     for (proto_type::const_iterator it = app_pack.begin();
          it != app_pack.end(); ++it) {
       base::DictionaryValue* entry = new base::DictionaryValue;
       if (it->has_extension_id()) {
         entry->SetString(policy::AppPackUpdater::kExtensionId,
                          it->extension_id());
@@ skipping 213 matching lines @@
         Reload();
         return;
       }
       LOG(ERROR) << "No retries left";
       break;
     }
   }
 }
 
 }  // namespace chromeos