diff options
Diffstat (limited to 'webkit/glue/plugins/plugin_list_win.cc')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_win.cc | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc index b5ded9e..4869262 100644 --- a/webkit/glue/plugins/plugin_list_win.cc +++ b/webkit/glue/plugins/plugin_list_win.cc @@ -12,11 +12,11 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/registry.h" #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/win/registry.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/plugin_lib.h" #include "webkit/glue/webkit_glue.h" @@ -67,7 +67,7 @@ bool GetInstalledPath(const TCHAR* app, FilePath* out) { reg_path.append(L"\\"); reg_path.append(app); - RegKey key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ); + base::win::RegKey key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ); std::wstring path; if (key.ReadValue(kRegistryPath, &path)) { *out = FilePath(path); @@ -82,13 +82,13 @@ void GetPluginsInRegistryDirectory( HKEY root_key, const std::wstring& registry_folder, std::set<FilePath>* plugin_dirs) { - for (RegistryKeyIterator iter(root_key, registry_folder.c_str()); + for (base::win::RegistryKeyIterator iter(root_key, registry_folder.c_str()); iter.Valid(); ++iter) { // Use the registry to gather plugin across the file system. std::wstring reg_path = registry_folder; reg_path.append(L"\\"); reg_path.append(iter.Name()); - RegKey key(root_key, reg_path.c_str(), KEY_READ); + base::win::RegKey key(root_key, reg_path.c_str(), KEY_READ); std::wstring path; if (key.ReadValue(kRegistryPath, &path)) @@ -99,11 +99,12 @@ void GetPluginsInRegistryDirectory( // Enumerate through the registry key to find all installed FireFox paths. // FireFox 3 beta and version 2 can coexist. See bug: 1025003 void GetFirefoxInstalledPaths(std::vector<FilePath>* out) { - RegistryKeyIterator it(HKEY_LOCAL_MACHINE, kRegistryFirefoxInstalled); + base::win::RegistryKeyIterator it(HKEY_LOCAL_MACHINE, + kRegistryFirefoxInstalled); for (; it.Valid(); ++it) { std::wstring full_path = std::wstring(kRegistryFirefoxInstalled) + L"\\" + it.Name() + L"\\Main"; - RegKey key(HKEY_LOCAL_MACHINE, full_path.c_str(), KEY_READ); + base::win::RegKey key(HKEY_LOCAL_MACHINE, full_path.c_str(), KEY_READ); std::wstring install_dir; if (!key.ReadValue(L"Install Directory", &install_dir)) continue; @@ -180,7 +181,8 @@ void GetWindowsMediaDirectory(std::set<FilePath>* plugin_dirs) { void GetJavaDirectory(std::set<FilePath>* plugin_dirs) { // Load the new NPAPI Java plugin // 1. Open the main JRE key under HKLM - RegKey java_key(HKEY_LOCAL_MACHINE, kRegistryJava, KEY_QUERY_VALUE); + base::win::RegKey java_key(HKEY_LOCAL_MACHINE, kRegistryJava, + KEY_QUERY_VALUE); // 2. Read the current Java version std::wstring java_version; @@ -304,13 +306,13 @@ bool HaveSharedMimeType(const WebPluginInfo& plugin1, // version is newer than a's, or false if it's equal or older. bool IsNewerVersion(const std::wstring& a, const std::wstring& b) { std::vector<std::wstring> a_ver, b_ver; - SplitString(a, ',', &a_ver); - SplitString(b, ',', &b_ver); + base::SplitString(a, ',', &a_ver); + base::SplitString(b, ',', &b_ver); if (a_ver.size() == 1 && b_ver.size() == 1) { a_ver.clear(); b_ver.clear(); - SplitString(a, '.', &a_ver); - SplitString(b, '.', &b_ver); + base::SplitString(a, '.', &a_ver); + base::SplitString(b, '.', &b_ver); } if (a_ver.size() != b_ver.size()) return false; @@ -371,7 +373,7 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, // and don't depend on XPCOM. if (filename == kJavaPlugin1 || filename == kJavaPlugin2) { std::vector<std::wstring> ver; - SplitString(info.version, '.', &ver); + base::SplitString(info.version, '.', &ver); int major, minor, update; if (ver.size() == 4 && base::StringToInt(ver[0], &major) && |