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

Unified Diff: base/metrics/histogram.cc

Issue 596103002: Fix more disabled MSVC warnings, base/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 6 years, 3 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 | « base/metrics/field_trial_unittest.cc ('k') | base/metrics/histogram_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/metrics/histogram.cc
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc
index 6e30892179a7c83d60b7188d1393fba3c7c1b226..6bab0eb43c0673d0cb3309de29d62598602db595 100644
--- a/base/metrics/histogram.cc
+++ b/base/metrics/histogram.cc
@@ -128,8 +128,9 @@ HistogramBase* Histogram::FactoryTimeGet(const string& name,
TimeDelta maximum,
size_t bucket_count,
int32 flags) {
- return FactoryGet(name, minimum.InMilliseconds(), maximum.InMilliseconds(),
- bucket_count, flags);
+ return FactoryGet(name, static_cast<Sample>(minimum.InMilliseconds()),
+ static_cast<Sample>(maximum.InMilliseconds()), bucket_count,
+ flags);
}
// Calculate what range of values are held in each bucket.
@@ -528,8 +529,9 @@ HistogramBase* LinearHistogram::FactoryTimeGet(const string& name,
TimeDelta maximum,
size_t bucket_count,
int32 flags) {
- return FactoryGet(name, minimum.InMilliseconds(), maximum.InMilliseconds(),
- bucket_count, flags);
+ return FactoryGet(name, static_cast<Sample>(minimum.InMilliseconds()),
+ static_cast<Sample>(maximum.InMilliseconds()), bucket_count,
+ flags);
}
HistogramBase* LinearHistogram::FactoryGetWithRangeDescription(
« no previous file with comments | « base/metrics/field_trial_unittest.cc ('k') | base/metrics/histogram_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698