Commit 497051b9 authored by Will Harris's avatar Will Harris Committed by Commit Bot

Fix implicit 64 to 32 conversion in Chrome process finder.

../../chrome/browser/win/chrome_process_finder.cc(97,41):  warning: implicit conversion loses integer precision: 'int64_t' (aka 'long long') to 'int' [-Wshorten-64-to-32]
  timeout_in_milliseconds = new_timeout.InMilliseconds();
                          ~ ~~~~~~~~~~~~^~~~~~~~~~~~~~~~

BUG=879657

Change-Id: I2a711f97feb92925a3b53e08d06af5da1b61820e
Reviewed-on: https://chromium-review.googlesource.com/1214744
Commit-Queue: Will Harris <wfh@chromium.org>
Reviewed-by: default avatarGreg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590416}
parent e8eea72e
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/process/process.h" #include "base/process/process.h"
#include "base/process/process_info.h" #include "base/process/process_info.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
...@@ -25,7 +26,7 @@ ...@@ -25,7 +26,7 @@
namespace { namespace {
int timeout_in_milliseconds = 20 * 1000; uint32_t g_timeout_in_milliseconds = 20 * 1000;
} // namespace } // namespace
...@@ -74,7 +75,7 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window, ...@@ -74,7 +75,7 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window,
DWORD_PTR result = 0; DWORD_PTR result = 0;
if (::SendMessageTimeout(remote_window, WM_COPYDATA, NULL, if (::SendMessageTimeout(remote_window, WM_COPYDATA, NULL,
reinterpret_cast<LPARAM>(&cds), SMTO_ABORTIFHUNG, reinterpret_cast<LPARAM>(&cds), SMTO_ABORTIFHUNG,
timeout_in_milliseconds, &result)) { g_timeout_in_milliseconds, &result)) {
return result ? NOTIFY_SUCCESS : NOTIFY_FAILED; return result ? NOTIFY_SUCCESS : NOTIFY_FAILED;
} }
...@@ -93,8 +94,9 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window, ...@@ -93,8 +94,9 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window,
base::TimeDelta SetNotificationTimeoutForTesting(base::TimeDelta new_timeout) { base::TimeDelta SetNotificationTimeoutForTesting(base::TimeDelta new_timeout) {
base::TimeDelta old_timeout = base::TimeDelta old_timeout =
base::TimeDelta::FromMilliseconds(timeout_in_milliseconds); base::TimeDelta::FromMilliseconds(g_timeout_in_milliseconds);
timeout_in_milliseconds = new_timeout.InMilliseconds(); g_timeout_in_milliseconds =
base::checked_cast<uint32_t>(new_timeout.InMilliseconds());
return old_timeout; return old_timeout;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment