| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" | 5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 if (result != STATUS_SUCCESS) | 249 if (result != STATUS_SUCCESS) |
| 250 return L""; | 250 return L""; |
| 251 | 251 |
| 252 KEY_NAME_INFORMATION* info = | 252 KEY_NAME_INFORMATION* info = |
| 253 reinterpret_cast<KEY_NAME_INFORMATION*>(buffer.get()); | 253 reinterpret_cast<KEY_NAME_INFORMATION*>(buffer.get()); |
| 254 return std::wstring(info->Name, info->NameLength / sizeof(wchar_t)); | 254 return std::wstring(info->Name, info->NameLength / sizeof(wchar_t)); |
| 255 } | 255 } |
| 256 | 256 |
| 257 int GetPluginMajorVersion(const WebPluginInfo& plugin_info) { | 257 int GetPluginMajorVersion(const WebPluginInfo& plugin_info) { |
| 258 Version plugin_version; | 258 Version plugin_version; |
| 259 PluginGroup::CreateVersionFromString(plugin_info.version, &plugin_version); | 259 WebPluginInfo::CreateVersionFromString(plugin_info.version, &plugin_version); |
| 260 | 260 |
| 261 int major_version = 0; | 261 int major_version = 0; |
| 262 if (plugin_version.IsValid()) | 262 if (plugin_version.IsValid()) |
| 263 major_version = plugin_version.components()[0]; | 263 major_version = plugin_version.components()[0]; |
| 264 | 264 |
| 265 return major_version; | 265 return major_version; |
| 266 } | 266 } |
| 267 | 267 |
| 268 bool GetPluginPropertyFromWindow( | 268 bool GetPluginPropertyFromWindow( |
| 269 HWND window, const wchar_t* plugin_atom_property, | 269 HWND window, const wchar_t* plugin_atom_property, |
| (...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1698 ::ReleaseCapture(); | 1698 ::ReleaseCapture(); |
| 1699 break; | 1699 break; |
| 1700 | 1700 |
| 1701 default: | 1701 default: |
| 1702 break; | 1702 break; |
| 1703 } | 1703 } |
| 1704 } | 1704 } |
| 1705 | 1705 |
| 1706 } // namespace npapi | 1706 } // namespace npapi |
| 1707 } // namespace webkit | 1707 } // namespace webkit |
| OLD | NEW |