| Index: ui/base/webui/web_ui_util.cc
|
| diff --git a/ui/base/webui/web_ui_util.cc b/ui/base/webui/web_ui_util.cc
|
| index 1785d6f6f8c9f919ed3973191111ae2c0d82b913..c67e23edd40ef2c96b7873e3b7757800d1bc0be3 100644
|
| --- a/ui/base/webui/web_ui_util.cc
|
| +++ b/ui/base/webui/web_ui_util.cc
|
| @@ -95,7 +95,7 @@ bool ParseScaleFactor(const base::StringPiece& identifier,
|
| LOG(WARNING) << "Invalid scale factor format: " << identifier;
|
| return false;
|
| }
|
| - *scale_factor = scale;
|
| + *scale_factor = static_cast<float>(scale);
|
| return true;
|
| }
|
|
|
|
|