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

chrome_frame/chrome_launcher_utils.cc

 // Copyright (c) 2011 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_frame/chrome_launcher_utils.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/chrome_frame_automation.h"
+#include "chrome_frame/policy_settings.h"
 
 namespace {
 
 const char kUpdateCommandFlag[] = "--update-cmd";
 
 // Searches for the path to chrome_launcher.exe. Will return false if this
 // executable cannot be found, otherwise the command line will be placed in
 // |command_line|.
 bool CreateChromeLauncherCommandLine(scoped_ptr<CommandLine>* command_line) {
   DCHECK(command_line);
@@ skipping 38 matching lines @@
 
   return success;
 }
 
 bool CreateLaunchCommandLine(scoped_ptr<CommandLine>* command_line) {
   DCHECK(command_line);
 
   // Shortcut for OS versions that don't need the integrity broker.
   if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     command_line->reset(new CommandLine(GetChromeExecutablePath()));
+
+    // When we do not use the Chrome Launcher, we need to add the optional extra
+    // parameters from the group policy here (this is normally done by the
+    // chrome launcher).  We don't do this when we use the launcher as the
+    // optional arguments could trip off sanitization checks and prevent Chrome
+    // from being launched.
+    const CommandLine& additional_params =
+        PolicySettings::GetInstance()->AdditionalLaunchParameters();
+    command_line->get()->AppendArguments(additional_params, false);
     return true;
   }
 
   return CreateChromeLauncherCommandLine(command_line);
 }
 
 FilePath GetChromeExecutablePath() {
   FilePath cur_path;
   PathService::Get(base::DIR_MODULE, &cur_path);
   cur_path = cur_path.Append(chrome::kBrowserProcessExecutableName);
 
   // The installation model for Chrome places the DLLs in a versioned
   // sub-folder one down from the Chrome executable. If we fail to find
   // chrome.exe in the current path, try looking one up and launching that
   // instead.
   if (!file_util::PathExists(cur_path)) {
     PathService::Get(base::DIR_MODULE, &cur_path);
     cur_path = cur_path.DirName().Append(chrome::kBrowserProcessExecutableName);
   }
 
   return cur_path;
 }
 
 }  // namespace chrome_launcher