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/util/shell_util.cc | |
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/util/shell_util.cc')
-rw-r--r-- | chrome/installer/util/shell_util.cc | 18 |
1 files changed, 12 insertions, 6 deletions
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"; |