Merge 21428 - Allow two user level installs of Chrome to have default browser...

chrome/installer/util/util_constants.h

 // Copyright (c) 2006-2009 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.
 //
 // Defines all install related constants that need to be used by Chrome as
 // well as Chrome Installer.
 
-#ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
-#define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
+#ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
+#define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
 
 namespace installer_util {
 
 // Return status of installer
 enum InstallStatus {
   FIRST_INSTALL_SUCCESS, // Successfully installed Chrome for the first time
   INSTALL_REPAIRED,      // Same version reinstalled for repair
   NEW_VERSION_UPDATED,   // Chrome successfully updated to new version
   HIGHER_VERSION_EXISTS, // Higher version of Chrome already exists
   USER_LEVEL_INSTALL_EXISTS, // User level install already exists
@@ skipping 29 matching lines @@
 extern const wchar_t kDoNotLaunchChrome[];
 extern const wchar_t kDoNotRemoveSharedItems[];
 extern const wchar_t kEnableLogging[];
 extern const wchar_t kForceUninstall[];
 extern const wchar_t kInstallArchive[];
 extern const wchar_t kInstallerData[];
 extern const wchar_t kLogFile[];
 extern const wchar_t kMakeChromeDefault[];
 extern const wchar_t kNewSetupExe[];
 extern const wchar_t kRegisterChromeBrowser[];
+extern const wchar_t kRegisterChromeBrowserSuffix[];
 extern const wchar_t kRenameChromeExe[];
 extern const wchar_t kRemoveChromeRegistration[];
 extern const wchar_t kRunAsAdmin[];
 extern const wchar_t kSystemLevel[];
 extern const wchar_t kUninstall[];
 extern const wchar_t kUpdateSetupExe[];
 extern const wchar_t kVerboseLogging[];
 extern const wchar_t kShowEula[];
 extern const wchar_t kAltDesktopShortcut[];
 extern const wchar_t kInactiveUserToast[];
 }  // namespace switches
 
 extern const wchar_t kInstallBinaryDir[];
 extern const wchar_t kInstallUserDataDir[];
 extern const wchar_t kChromeExe[];
 extern const wchar_t kChromeOldExe[];
 extern const wchar_t kChromeNewExe[];
 extern const wchar_t kChromeDll[];
 extern const wchar_t kSetupExe[];
 extern const wchar_t kInstallerDir[];
 
 extern const wchar_t kUninstallStringField[];
 extern const wchar_t kUninstallDisplayNameField[];
 extern const wchar_t kUninstallMetricsName[];
 extern const wchar_t kUninstallInstallationDate[];
 
 }  // namespace installer_util
 
-#endif  // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
+#endif  // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_