From 8bcdcbe8e59f804e03f75e86744211210c64484a Mon Sep 17 00:00:00 2001 From: "rahulk@google.com" Date: Mon, 18 Aug 2008 21:39:43 +0000 Subject: First set of changes to start separating Google specific branding from Chromium. This change mostly tries to modify installer to install Chromium or Google Chrome depending on a compile flag. The goal is to try to isolate all the differences in a single class that can be overridden for customization. There is also a lot of refactoring to make this happen. Some changes are yet to be done but I didn't want to make this change even bigger than it already is. With all these changes the default build should still work as it is (Google Chrome should get installed/uninstalled). The changes yet to be done: - Separating string resources (this is marked by TODO in one of the files) - Generate different chrome.7z (Chromium will not include rlz.dll) for mini_installer BUG=1296800 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@999 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/mini_installer/mini_installer.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'chrome/installer/mini_installer/mini_installer.h') diff --git a/chrome/installer/mini_installer/mini_installer.h b/chrome/installer/mini_installer/mini_installer.h index 785749e..f5de5cf 100644 --- a/chrome/installer/mini_installer/mini_installer.h +++ b/chrome/installer/mini_installer/mini_installer.h @@ -47,14 +47,18 @@ const wchar_t kBinResourceType[] = L"BN"; const wchar_t kLZCResourceType[] = L"BL"; const wchar_t kLZMAResourceType[] = L"B7"; -// Uninstall registry location -const wchar_t kUninstallRegistryKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Chrome"; +// Registry key to get uninstall command const wchar_t kUninstallRegistryValueName[] = L"UninstallString"; - -// Uninstall registry key that lets user tell Chrome installer not to delete -// extracted files. -const wchar_t kCleanupRegistryKey[] = L"Software\\Google"; +// Registry key that tells Chrome installer not to delete extracted files. const wchar_t kCleanupRegistryValueName[] = L"ChromeInstallerCleanup"; +// Paths for the above two registry keys +#if defined(GOOGLE_CHROME_BUILD) +const wchar_t kUninstallRegistryKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome"; +const wchar_t kCleanupRegistryKey[] = L"Software\\Google"; +#else +const wchar_t kUninstallRegistryKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Chromium"; +const wchar_t kCleanupRegistryKey[] = L"Software\\Chromium"; +#endif // One gigabyte is the biggest resource size that it can handle. const int kMaxResourceSize = 1024*1024*1024; -- cgit v1.1