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

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: Removing unneeded include Created 5 years 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..47e253f0fde44d8b468bea2bc057024146540d7a 100644
--- a/chrome/browser/hang_monitor/hung_window_detector.cc
+++ b/chrome/browser/hang_monitor/hung_window_detector.cc
@@ -8,6 +8,7 @@
#include <atlbase.h>
#include "base/logging.h"
+#include "base/win/win_util.h"
#include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
#include "content/public/common/result_codes.h"
@@ -88,10 +89,8 @@ 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)
- int child_window_message_timeout =
- reinterpret_cast<int>(GetProp(child_window, kHungChildWindowTimeout));
-#pragma warning(default:4311)
+ int child_window_message_timeout = base::win::HandleToUint32(
+ GetProp(child_window, kHungChildWindowTimeout));
if (!child_window_message_timeout) {
child_window_message_timeout = message_response_timeout_;
}
« no previous file with comments | « chrome/browser/hang_monitor/hung_plugin_action.cc ('k') | components/startup_metric_utils/browser/startup_metric_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698