summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup/setup_util.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/installer/setup/setup_util.h')
-rw-r--r--chrome/installer/setup/setup_util.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
index c9e067f..fc06482 100644
--- a/chrome/installer/setup/setup_util.h
+++ b/chrome/installer/setup/setup_util.h
@@ -7,9 +7,16 @@
#ifndef CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
#define CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
+#include "base/command_line.h"
+#include "base/values.h"
#include "chrome/installer/util/version.h"
namespace setup_util {
+ // Parse command line and read master preferences, if present, to get
+ // distribution related install options. Merge them if any command line
+ // options present (command line value takes precedence).
+ DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line);
+
// Find the version of Chrome from an install source directory.
// Chrome_path should contain a version folder.
// Returns the first version found or NULL if no version is found.