Index: chrome/install_static/install_util.h |
diff --git a/chrome/install_static/install_util.h b/chrome/install_static/install_util.h |
index 32f36e9dccc2eac26bcd3b98cd16805dd3d5d326..3d57b238787130366ee15c3181fcb6b2018f8f07 100644 |
--- a/chrome/install_static/install_util.h |
+++ b/chrome/install_static/install_util.h |
@@ -23,10 +23,9 @@ enum class ProcessType { |
}; |
// TODO(ananta) |
-// http://crbug.com/604923 |
+// https://crbug.com/604923 |
// The constants defined in this file are also defined in chrome/installer and |
// other places. we need to unify them. |
- |
extern const wchar_t kChromeChannelUnknown[]; |
extern const wchar_t kChromeChannelCanary[]; |
extern const wchar_t kChromeChannelDev[]; |
@@ -44,6 +43,22 @@ extern const wchar_t kAppGuidCanary[]; |
extern const wchar_t kAppGuidGoogleChrome[]; |
extern const wchar_t kAppGuidGoogleBinaries[]; |
+// TODO(ananta) |
+// https://crbug.com/604923 |
+// Unify these constants with env_vars.h. |
+extern const wchar_t kHeadless[]; |
+extern const wchar_t kShowRestart[]; |
+extern const wchar_t kRestartInfo[]; |
+extern const wchar_t kRtlLocale[]; |
+ |
+// TODO(ananta) |
+// https://crbug.com/604923 |
+// Unify these constants with those defined in content_switches.h. |
+extern const char kGpuProcess[]; |
+extern const char kPpapiPluginProcess[]; |
+extern const char kRendererProcess[]; |
+extern const char kUtilityProcess[]; |
+ |
// Returns true if |exe_path| points to a Chrome installed in an SxS |
// installation. |
bool IsSxSChrome(const wchar_t* exe_path); |
@@ -96,15 +111,19 @@ bool GetDefaultCrashDumpLocation(base::string16* crash_dir); |
// block of the calling process. Returns an empty string if the variable does |
// not exist. |
std::string GetEnvironmentString(const std::string& variable_name); |
+base::string16 GetEnvironmentString16(const base::string16& variable_name); |
// Sets the environment variable identified by |variable_name| to the value |
// identified by |new_value|. |
bool SetEnvironmentString(const std::string& variable_name, |
const std::string& new_value); |
+bool SetEnvironmentString16(const base::string16& variable_name, |
+ const base::string16& new_value); |
// Returns true if the environment variable identified by |variable_name| |
// exists. |
bool HasEnvironmentVariable(const std::string& variable_name); |
+bool HasEnvironmentVariable16(const base::string16& variable_name); |
// Gets the exe version details like the |product_name|, |version|, |
// |special_build|, |channel_name|, etc. Most of this information is read |
@@ -170,6 +189,9 @@ std::string UTF16ToUTF8(const base::string16& source); |
std::vector<std::string> TokenizeString(const std::string& str, |
char delimiter, |
bool trim_spaces); |
+std::vector<base::string16> TokenizeString16(const base::string16& str, |
+ base::char16 delimiter, |
+ bool trim_spaces); |
// Compares version strings of the form "X.X.X.X" and returns the result of the |
// comparison in the |result| parameter. The result is as below: |