Adding policy support to Chrome Frame's launcher so that additional parameters can be passed to Chr…

chrome_frame/policy_settings.h

Index: chrome_frame/policy_settings.h
diff --git a/chrome_frame/policy_settings.h b/chrome_frame/policy_settings.h
index 8370b47513ff6cb1d4fe51ba6c388a4a7cfdda11..e1773be26e479d8c0a98a091f39d52e9dbda0e51 100644
--- a/chrome_frame/policy_settings.h
+++ b/chrome_frame/policy_settings.h
@@ -7,9 +7,10 @@
 
 #include <string>
 #include <vector>
-#include "base/memory/singleton.h"
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
+#include "base/memory/singleton.h"
 
 // A simple class that reads and caches policy settings for Chrome Frame.
 // TODO(tommi): Support refreshing when new settings are pushed.
@@ -38,15 +39,22 @@ class PolicySettings {
     return application_locale_;
   }
 
+  // Contains additional parameters that can optionally be configured for the
+  // current user via the policy settings.  The program part of this command
+  // line object must not be used when appending to another command line.
+  const CommandLine& AdditionalLaunchParameters() const;
+
   // Helper functions for reading settings from the registry
   static void ReadUrlSettings(RendererForUrl* default_renderer,
       std::vector<std::wstring>* renderer_exclusion_list);
   static void ReadContentTypeSetting(
       std::vector<std::wstring>* content_type_list);
-  static void ReadApplicationLocaleSetting(std::wstring* application_locale);
+  static void ReadStringSetting(const char* value_name, std::wstring* value);
 
  protected:
-  PolicySettings() : default_renderer_(RENDERER_NOT_SPECIFIED) {
+  PolicySettings()
+      : default_renderer_(RENDERER_NOT_SPECIFIED),
+        additional_launch_parameters_(CommandLine::NO_PROGRAM) {
     RefreshFromRegistry();
   }
 
@@ -61,6 +69,7 @@ class PolicySettings {
   std::vector<std::wstring> renderer_exclusion_list_;
   std::vector<std::wstring> content_type_list_;
   std::wstring application_locale_;
+  CommandLine additional_launch_parameters_;
 
  private:
   // This ensures no construction is possible outside of the class itself.