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/views | |
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/views')
-rw-r--r-- | chrome/browser/views/external_protocol_dialog.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/shell_dialogs_win.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc index 6dda2e3..3022c28 100644 --- a/chrome/browser/views/external_protocol_dialog.cc +++ b/chrome/browser/views/external_protocol_dialog.cc @@ -7,10 +7,10 @@ #include "app/l10n_util.h" #include "app/message_box_flags.h" #include "base/metrics/histogram.h" -#include "base/registry.h" #include "base/string_util.h" #include "base/thread.h" #include "base/utf_string_conversions.h" +#include "base/win/registry.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -160,7 +160,7 @@ std::wstring ExternalProtocolDialog::GetApplicationForProtocol( std::wstring url_spec = ASCIIToWide(url.possibly_invalid_spec()); std::wstring cmd_key_path = ASCIIToWide(url.scheme() + "\\shell\\open\\command"); - RegKey cmd_key(HKEY_CLASSES_ROOT, cmd_key_path.c_str(), KEY_READ); + base::win::RegKey cmd_key(HKEY_CLASSES_ROOT, cmd_key_path.c_str(), KEY_READ); size_t split_offset = url_spec.find(L':'); if (split_offset == std::wstring::npos) return std::wstring(); diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index e8ec6e8..d3fe7ae 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -14,11 +14,11 @@ #include "app/l10n_util.h" #include "base/file_util.h" #include "base/message_loop.h" -#include "base/registry.h" #include "base/scoped_comptr_win.h" #include "base/string_split.h" #include "base/thread.h" #include "base/utf_string_conversions.h" +#include "base/win/registry.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_thread.h" #include "gfx/font.h" @@ -49,7 +49,7 @@ std::wstring AppendExtensionIfNeeded(const std::wstring& filename, std::wstring file_extension(file_util::GetFileExtensionFromPath(filename)); std::wstring key(L"." + file_extension); if (!(filter_selected.empty() || filter_selected == L"*.*") && - !RegKey(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ).Valid() && + !base::win::RegKey(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ).Valid() && file_extension != suggested_ext) { if (return_value[return_value.length() - 1] != L'.') return_value.append(L"."); @@ -73,10 +73,10 @@ namespace { static bool GetRegistryDescriptionFromExtension(const std::wstring& file_ext, std::wstring* reg_description) { DCHECK(reg_description); - RegKey reg_ext(HKEY_CLASSES_ROOT, file_ext.c_str(), KEY_READ); + base::win::RegKey reg_ext(HKEY_CLASSES_ROOT, file_ext.c_str(), KEY_READ); std::wstring reg_app; if (reg_ext.ReadValue(NULL, ®_app) && !reg_app.empty()) { - RegKey reg_link(HKEY_CLASSES_ROOT, reg_app.c_str(), KEY_READ); + base::win::RegKey reg_link(HKEY_CLASSES_ROOT, reg_app.c_str(), KEY_READ); if (reg_link.ReadValue(NULL, reg_description)) return true; } |