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

Unified Diff: chrome/browser/hang_monitor/hung_window_detector.cc

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Supply reference for handles-are-32-bits claim Created 5 years, 1 month 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
Index: chrome/browser/hang_monitor/hung_window_detector.cc
diff --git a/chrome/browser/hang_monitor/hung_window_detector.cc b/chrome/browser/hang_monitor/hung_window_detector.cc
index d58e36a47cfb6976f9fc537c9babda723e0c161d..72b8c5d459560ac0e9a8daa29be3ffb2dc300a76 100644
--- a/chrome/browser/hang_monitor/hung_window_detector.cc
+++ b/chrome/browser/hang_monitor/hung_window_detector.cc
@@ -88,10 +88,10 @@ bool HungWindowDetector::CheckChildWindow(HWND child_window) {
// The message timeout for a child window starts of with a default
// value specified by the message_response_timeout_ member. It is
// tracked by a property on the child window.
-#pragma warning(disable:4311)
+#pragma warning(disable : 4311 4302)
int child_window_message_timeout =
reinterpret_cast<int>(GetProp(child_window, kHungChildWindowTimeout));
-#pragma warning(default:4311)
+#pragma warning(default : 4311 4302)
if (!child_window_message_timeout) {
child_window_message_timeout = message_response_timeout_;
}

Powered by Google App Engine
This is Rietveld 408576698