| Index: content/browser/plugin_service_impl.cc
|
| diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
|
| index fa22d3d34e40cdb82acf19b78b46bd6ae7c6507b..382dbbb1328a179d3be8cfdbeb84d393444c8f8b 100644
|
| --- a/content/browser/plugin_service_impl.cc
|
| +++ b/content/browser/plugin_service_impl.cc
|
| @@ -838,8 +838,8 @@ void PluginServiceImpl::AppActivated() {
|
| bool GetPluginPropertyFromWindow(
|
| HWND window, const wchar_t* plugin_atom_property,
|
| base::string16* plugin_property) {
|
| - ATOM plugin_atom = reinterpret_cast<ATOM>(
|
| - GetPropW(window, plugin_atom_property));
|
| + ATOM plugin_atom = static_cast<ATOM>(
|
| + reinterpret_cast<uintptr_t>(GetPropW(window, plugin_atom_property)));
|
| if (plugin_atom != 0) {
|
| WCHAR plugin_property_local[MAX_PATH] = {0};
|
| GlobalGetAtomNameW(plugin_atom,
|
|
|