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_frame/test/chrome_frame_test_utils.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_frame/test/chrome_frame_test_utils.cc')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index e98d353..99fedd2 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -14,13 +14,13 @@ #include "base/file_version_info.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/registry.h" // to find IE and firefox #include "base/scoped_handle.h" #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/stringprintf.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/common/chrome_switches.h" #include "chrome/common/chrome_paths.h" @@ -116,7 +116,8 @@ std::wstring GetExecutableAppPath(const std::wstring& file) { L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"; std::wstring app_path; - RegKey key(HKEY_LOCAL_MACHINE, (kAppPathsKey + file).c_str(), KEY_READ); + base::win::RegKey key(HKEY_LOCAL_MACHINE, (kAppPathsKey + file).c_str(), + KEY_READ); if (key.Handle()) { key.ReadValue(NULL, &app_path); } @@ -129,7 +130,7 @@ std::wstring FormatCommandForApp(const std::wstring& exe_name, std::wstring reg_path( base::StringPrintf(L"Applications\\%ls\\shell\\open\\command", exe_name.c_str())); - RegKey key(HKEY_CLASSES_ROOT, reg_path.c_str(), KEY_READ); + base::win::RegKey key(HKEY_CLASSES_ROOT, reg_path.c_str(), KEY_READ); std::wstring command; if (key.Handle()) { |