summaryrefslogtreecommitdiffstats
path: root/chrome_frame/policy_settings.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-17 04:41:54 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-17 04:41:54 +0000
commit2d650398a9afa1fc3c168aed736daa13901809a8 (patch)
tree6dc4a48b54cdca7f0946ac097353b5c1ca733b40 /chrome_frame/policy_settings.cc
parentdf0ca6c858762b101bf424ff6c0522409fa195fc (diff)
downloadchromium_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/policy_settings.cc')
-rw-r--r--chrome_frame/policy_settings.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/policy_settings.cc b/chrome_frame/policy_settings.cc
index 7e5be2c..d00e69a 100644
--- a/chrome_frame/policy_settings.cc
+++ b/chrome_frame/policy_settings.cc
@@ -5,9 +5,9 @@
#include "chrome_frame/policy_settings.h"
#include "base/logging.h"
-#include "base/registry.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
+#include "base/win/registry.h"
#include "chrome/common/policy_constants.h"
#include "chrome_frame/utils.h"
@@ -45,7 +45,7 @@ void PolicySettings::RefreshFromRegistry() {
default_renderer_ = RENDERER_NOT_SPECIFIED;
renderer_exclusion_list_.clear();
- RegKey config_key;
+ base::win::RegKey config_key;
DWORD value = RENDERER_NOT_SPECIFIED;
HKEY root_key[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER };
std::wstring settings_value(