Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(839)

Unified Diff: content/browser/plugin_service_impl.cc

Issue 1111913002: vs2015: avoid narrowing warning in plugin_service_impl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2015-v8
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698