diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:41:54 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:41:54 +0000 |
| commit | 2d650398a9afa1fc3c168aed736daa13901809a8 (patch) | |
| tree | 6dc4a48b54cdca7f0946ac097353b5c1ca733b40 /chrome/browser/shell_integration_win.cc | |
| parent | df0ca6c858762b101bf424ff6c0522409fa195fc (diff) | |
| download | chromium_src-2d650398a9afa1fc3c168aed736daa13901809a8.zip chromium_src-2d650398a9afa1fc3c168aed736daa13901809a8.tar.gz chromium_src-2d650398a9afa1fc3c168aed736daa13901809a8.tar.bz2 | |
Move pe_image and registry from base to base/win and use the namespace. It removes windows_message_list which isn't used.
This keeps a stub for registry in the old location until we can update that.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3836005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_win.cc')
| -rw-r--r-- | chrome/browser/shell_integration_win.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 98e6729..2d53d28 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -13,12 +13,12 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/registry.h" #include "base/scoped_comptr_win.h" #include "base/string_util.h" #include "base/task.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" +#include "base/win/registry.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/web_applications/web_app.h" @@ -340,7 +340,7 @@ ShellIntegration::DefaultBrowserState ShellIntegration::IsDefaultBrowser() { HKEY root_key = HKEY_CLASSES_ROOT; // Check <protocol>\shell\open\command std::wstring key_path(kChromeProtocols[i] + ShellUtil::kRegShellOpen); - RegKey key(root_key, key_path.c_str(), KEY_READ); + base::win::RegKey key(root_key, key_path.c_str(), KEY_READ); std::wstring value; if (!key.Valid() || !key.ReadValue(L"", &value)) return NOT_DEFAULT_BROWSER; @@ -371,14 +371,15 @@ bool ShellIntegration::IsFirefoxDefaultBrowser() { bool ff_default = false; if (base::win::GetVersion() >= base::win::VERSION_VISTA) { std::wstring app_cmd; - RegKey key(HKEY_CURRENT_USER, ShellUtil::kRegVistaUrlPrefs, KEY_READ); + base::win::RegKey key(HKEY_CURRENT_USER, + ShellUtil::kRegVistaUrlPrefs, KEY_READ); if (key.Valid() && key.ReadValue(L"Progid", &app_cmd) && app_cmd == L"FirefoxURL") ff_default = true; } else { std::wstring key_path(L"http"); key_path.append(ShellUtil::kRegShellOpen); - RegKey key(HKEY_CLASSES_ROOT, key_path.c_str(), KEY_READ); + base::win::RegKey key(HKEY_CLASSES_ROOT, key_path.c_str(), KEY_READ); std::wstring app_cmd; if (key.Valid() && key.ReadValue(L"", &app_cmd) && std::wstring::npos != StringToLowerASCII(app_cmd).find(L"firefox")) |