diff options
author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 12:54:04 +0000 |
---|---|---|
committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 12:54:04 +0000 |
commit | f09c718082535c0de7f066cb63f95809070f35a6 (patch) | |
tree | 0c7bbd37cccef8748b8c6e1768d2d95f7989a1a0 /chrome/installer | |
parent | 15567be3dd3dacb0abae800ede436eac8123482c (diff) | |
download | chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.zip chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.tar.gz chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.tar.bz2 |
NO CODE CHANGE.
Fix files with lines > 80 cols. Part 2.
Review URL: http://codereview.chromium.org/40226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r-- | chrome/installer/gcapi/gcapi.cc | 18 | ||||
-rw-r--r-- | chrome/installer/mini_installer/mini_installer.h | 6 | ||||
-rw-r--r-- | chrome/installer/setup/setup_constants.cc | 3 | ||||
-rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 3 | ||||
-rw-r--r-- | chrome/installer/util/shell_util.cc | 18 |
5 files changed, 32 insertions, 16 deletions
diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index f0a27b4..75bae0c 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -16,12 +16,17 @@ namespace { -const wchar_t kChromeRegClientsKey[] = L"Software\\Google\\Update\\Clients\\{8A69D345-D564-463c-AFF1-A69D9E530F96}"; -const wchar_t kChromeRegClientStateKey[] = L"Software\\Google\\Update\\ClientState\\{8A69D345-D564-463c-AFF1-A69D9E530F96}"; +const wchar_t kChromeRegClientsKey[] = + L"Software\\Google\\Update\\Clients\\" + L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; +const wchar_t kChromeRegClientStateKey[] = + L"Software\\Google\\Update\\ClientState\\" + L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; const wchar_t kChromeRegLaunchCmd[] = L"InstallerSuccessLaunchCmdLine"; const wchar_t kChromeRegLastLaunchCmd[] = L"LastInstallerSuccessLaunchCmdLine"; const wchar_t kChromeRegVersion[] = L"pv"; -const wchar_t kNoChromeOfferUntil[] = L"SOFTWARE\\Google\\No Chrome Offer Until"; +const wchar_t kNoChromeOfferUntil[] = + L"SOFTWARE\\Google\\No Chrome Offer Until"; // Return the company name specified in the file version info resource. bool GetCompanyName(const wchar_t* filename, wchar_t* buffer, DWORD out_len) { @@ -95,7 +100,7 @@ bool CanReOfferChrome(BOOL set_flag) { SYSTEMTIME now; GetLocalTime(&now); DWORD today = now.wYear * 10000 + now.wMonth * 100 + now.wDay; - + // Cannot re-offer, if the timer already exists and is not expired yet. DWORD value_type = REG_DWORD; DWORD value_data = 0; @@ -120,7 +125,7 @@ bool CanReOfferChrome(BOOL set_flag) { timer.wYear = timer.wYear + 1; } DWORD value = timer.wYear * 10000 + timer.wMonth * 100 + timer.wDay; - ::RegSetValueEx(key, company, 0, REG_DWORD, (LPBYTE)&value, + ::RegSetValueEx(key, company, 0, REG_DWORD, (LPBYTE)&value, sizeof(DWORD)); } } @@ -278,7 +283,8 @@ bool GetUserIdForProcess(size_t pid, wchar_t** user_sid) { } // namespace #pragma comment(linker, "/EXPORT:GoogleChromeCompatibilityCheck=_GoogleChromeCompatibilityCheck@8,PRIVATE") -DLLEXPORT BOOL __stdcall GoogleChromeCompatibilityCheck(BOOL set_flag, DWORD *reasons) { +DLLEXPORT BOOL __stdcall GoogleChromeCompatibilityCheck(BOOL set_flag, + DWORD *reasons) { DWORD local_reasons = 0; bool is_vista_or_later = false; diff --git a/chrome/installer/mini_installer/mini_installer.h b/chrome/installer/mini_installer/mini_installer.h index 3f0a6d4..506e218 100644 --- a/chrome/installer/mini_installer/mini_installer.h +++ b/chrome/installer/mini_installer/mini_installer.h @@ -28,10 +28,12 @@ const wchar_t kUninstallRegistryValueName[] = L"UninstallString"; 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 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 kUninstallRegistryKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Chromium"; const wchar_t kCleanupRegistryKey[] = L"Software\\Chromium"; #endif diff --git a/chrome/installer/setup/setup_constants.cc b/chrome/installer/setup/setup_constants.cc index 300c9d5..d9bd2f2 100644 --- a/chrome/installer/setup/setup_constants.cc +++ b/chrome/installer/setup/setup_constants.cc @@ -17,6 +17,7 @@ const wchar_t kChromeCompressedPatchArchivePrefix[] = L"patch"; const wchar_t kInstallSourceDir[] = L"source"; const wchar_t kInstallSourceChromeDir[] = L"Chrome-bin"; -const wchar_t kMediaPlayerRegPath[] = L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList"; +const wchar_t kMediaPlayerRegPath[] = + L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList"; } // namespace installer diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index d70bcd2..b3ad065 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -232,7 +232,8 @@ std::wstring GoogleChromeDistribution::GetUninstallLinkName() { } std::wstring GoogleChromeDistribution::GetUninstallRegPath() { - return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome"; + return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + L"Google Chrome"; } std::wstring GoogleChromeDistribution::GetVersionKey() { diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 33a32f9..7984de6 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -45,7 +45,8 @@ class RegistryEntry { public: // This method returns a list of all the registry entries that are needed // to register Chrome. - static std::list<RegistryEntry*> GetAllEntries(const std::wstring& chrome_exe) { + static std::list<RegistryEntry*> GetAllEntries( + const std::wstring& chrome_exe) { std::list<RegistryEntry*> entries; std::wstring icon_path(chrome_exe); ShellUtil::GetChromeIcon(icon_path); @@ -96,7 +97,8 @@ class RegistryEntry { L"Software\\Clients\\StartMenuInternet\\chrome.exe", dist->GetApplicationName())); entries.push_front(new RegistryEntry( - L"Software\\Clients\\StartMenuInternet\\chrome.exe\\shell\\open\\command", + L"Software\\Clients\\StartMenuInternet\\chrome.exe\\shell\\open\\" + L"command", quoted_exe_path)); entries.push_front(new RegistryEntry( L"Software\\Clients\\StartMenuInternet\\chrome.exe\\DefaultIcon", @@ -132,16 +134,19 @@ class RegistryEntry { L"ApplicationName", dist->GetApplicationName())); entries.push_front(new RegistryEntry( - L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\StartMenu", + L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\" + L"StartMenu", L"StartMenuInternet", L"chrome.exe")); for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) { entries.push_front(new RegistryEntry( - L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\FileAssociations", + L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\" + L"FileAssociations", ShellUtil::kFileAssociations[i], ShellUtil::kChromeHTMLProgId)); } for (int i = 0; ShellUtil::kProtocolAssociations[i] != NULL; i++) { entries.push_front(new RegistryEntry( - L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\URLAssociations", + L"Software\\Clients\\StartMenuInternet\\chrome.exe\\Capabilities\\" + L"URLAssociations", ShellUtil::kProtocolAssociations[i], ShellUtil::kChromeHTMLProgId)); } return entries; @@ -383,7 +388,8 @@ const wchar_t* ShellUtil::kRegClasses = L"Software\\Classes"; const wchar_t* ShellUtil::kRegRegisteredApplications = L"Software\\RegisteredApplications"; const wchar_t* ShellUtil::kRegVistaUrlPrefs = - L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice"; + L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\" + L"http\\UserChoice"; const wchar_t* ShellUtil::kAppPathsRegistryKey = L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths"; const wchar_t* ShellUtil::kAppPathsRegistryPathName = L"Path"; |