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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More use of HandleToUint32 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
« chrome/app/close_handle_hook_win.cc ('K') | « chrome/app/close_handle_hook_win.cc ('k') | chrome/browser/hang_monitor/hung_window_detector.cc » ('j') | chrome/browser/hang_monitor/hung_window_detector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/hang_monitor/hung_plugin_action.cc
diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc
index 82142862ab0ad00c4cb6474dd4647c88ecf825b0..db96b33be64c40849755e952d445268339e75acb 100644
--- a/chrome/browser/hang_monitor/hung_plugin_action.cc
+++ b/chrome/browser/hang_monitor/hung_plugin_action.cc
@@ -16,6 +16,10 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/win/hwnd_util.h"
ananta 2015/11/18 19:13:42 The OS_WIN ifdef is not needed. This file is windo
+#if defined(OS_WIN)
+#include "base/win/win_util.h"
+#endif
+
namespace {
const wchar_t kGTalkPluginName[] = L"Google Talk Plugin";
@@ -123,11 +127,8 @@ bool HungPluginAction::OnHungWindowDetected(HWND hung_window,
// exists. The property is deleted if the window becomes
// responsive.
continue_hang_detection = false;
-#pragma warning(disable:4311)
- int child_window_message_timeout =
- reinterpret_cast<int>(GetProp(
- hung_window, HungWindowDetector::kHungChildWindowTimeout));
-#pragma warning(default:4311)
+ int child_window_message_timeout = base::win::HandleToUint32(
+ GetProp(hung_window, HungWindowDetector::kHungChildWindowTimeout));
if (child_window_message_timeout) {
child_window_message_timeout *= 2;
#pragma warning(disable:4312)
« chrome/app/close_handle_hook_win.cc ('K') | « chrome/app/close_handle_hook_win.cc ('k') | chrome/browser/hang_monitor/hung_window_detector.cc » ('j') | chrome/browser/hang_monitor/hung_window_detector.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698