Adds a device policy to specify the set of initial urls for the demo user account.

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 37 matching lines @@
   kIdleLogoutWarningDuration,
   kReleaseChannel,
   kReleaseChannelDelegated,
   kReportDeviceActivityTimes,
   kReportDeviceBootMode,
   kReportDeviceVersionInfo,
   kScreenSaverExtensionId,
   kScreenSaverTimeout,
   kSettingProxyEverywhere,
   kSignedDataRoamingEnabled,
+  kStartUpUrls,
   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";
 
 bool IsControlledSetting(const std::string& pref_path) {
@@ skipping 214 matching lines @@
     // intended to be customizable by the user:
     //   kAppPack
     //   kIdleLogoutTimeout,
     //   kIdleLogoutWarningDuration,
     //   kReleaseChannelDelegated,
     //   kReportDeviceVersionInfo
     //   kReportDeviceActivityTimes
     //   kReportDeviceBootMode
     //   kScreenSaverExtensionId,
     //   kScreenSaverTimeout,
+    //   kStartUpUrls
 
     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 129 matching lines @@
       if (it->has_update_url())
         entry->SetString(policy::AppPackUpdater::kUpdateUrl, it->update_url());
       if (it->has_online_only()) {
         entry->SetBoolean(policy::AppPackUpdater::kOnlineOnly,
                           it->online_only());
       }
       list->Append(entry);
     }
     new_values_cache->SetValue(kAppPack, list);
   }
+
+  base::ListValue* list = new base::ListValue();
+  const em::StartUpUrlsProto& urls_proto = policy.start_up_urls();
+  const RepeatedPtrField<std::string>& urls = urls_proto.start_up_urls();
+  for (RepeatedPtrField<std::string>::const_iterator it = urls.begin();
+       it != urls.end(); ++it) {
+    list->Append(base::Value::CreateStringValue(*it));
+  }
+  new_values_cache->SetValue(kStartUpUrls, list);

[Joao da Silva, 2012/03/16 15:55:18]

Wrap this block with if (policy.has_start_up_urls()) { ... }

[pastarmovj, 2012/03/19 14:20:49]

Done.

 }
 
 void DeviceSettingsProvider::DecodeNetworkPolicies(
     const em::ChromeDeviceSettingsProto& policy,
     PrefValueMap* new_values_cache) const {
   new_values_cache->SetBoolean(
       kSignedDataRoamingEnabled,
       policy.has_data_roaming_enabled() &&
       policy.data_roaming_enabled().has_data_roaming_enabled() &&
       policy.data_roaming_enabled().data_roaming_enabled());
@@ skipping 271 matching lines @@
         Reload();
         return;
       }
       LOG(ERROR) << "No retries left";
       break;
     }
   }
 }
 
 }  // namespace chromeos