| Index: chrome/installer/util/shell_util.cc
|
| diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
|
| index 222d8b7364560e09d80244496445b588f30b1296..226d88eabc1b196418fca78d11d689d0f3b11514 100644
|
| --- a/chrome/installer/util/shell_util.cc
|
| +++ b/chrome/installer/util/shell_util.cc
|
| @@ -49,6 +49,7 @@
|
| #include "chrome/installer/util/master_preferences_constants.h"
|
| #include "chrome/installer/util/util_constants.h"
|
| #include "chrome/installer/util/work_item.h"
|
| +#include "content/public/common/registry_utils_win.h"
|
|
|
| #include "installer_util_strings.h" // NOLINT
|
|
|
| @@ -439,12 +440,12 @@ class RegistryEntry {
|
| const base::string16& suffix,
|
| ScopedVector<RegistryEntry>* entries) {
|
| const base::FilePath chrome_path(chrome_exe);
|
| - base::string16 app_path_key(ShellUtil::kAppPathsRegistryKey);
|
| + base::string16 app_path_key(content::kRegistryAppsKey);
|
| app_path_key.push_back(base::FilePath::kSeparators[0]);
|
| app_path_key.append(chrome_path.BaseName().value());
|
| entries->push_back(new RegistryEntry(app_path_key, chrome_exe));
|
| entries->push_back(new RegistryEntry(app_path_key,
|
| - ShellUtil::kAppPathsRegistryPathName, chrome_path.DirName().value()));
|
| + content::kRegistryPath, chrome_path.DirName().value()));
|
|
|
| const base::string16 html_prog_id(GetBrowserProgId(suffix));
|
| for (int i = 0; ShellUtil::kPotentialFileAssociations[i] != NULL; i++) {
|
| @@ -1403,9 +1404,6 @@ const wchar_t* ShellUtil::kRegRegisteredApplications =
|
| const wchar_t* ShellUtil::kRegVistaUrlPrefs =
|
| 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";
|
|
|
| const wchar_t* ShellUtil::kDefaultFileAssociations[] = {L".htm", L".html",
|
| L".shtml", L".xht", L".xhtml", NULL};
|
|
|