Chromium Code Reviews| Index: extensions/browser/guest_view/guest_view_base.cc |
| diff --git a/extensions/browser/guest_view/guest_view_base.cc b/extensions/browser/guest_view/guest_view_base.cc |
| index b7bf687b7a249cc485d3a647f398889c1075f0de..bb9db3b59967ff43240f35ca1bbf8bff3ff37ff3 100644 |
| --- a/extensions/browser/guest_view/guest_view_base.cc |
| +++ b/extensions/browser/guest_view/guest_view_base.cc |
| @@ -754,9 +754,24 @@ void GuestViewBase::SetUpSizing(const base::DictionaryValue& params) { |
| double element_width = 0.0; |
| params.GetDouble(guestview::kElementHeight, &element_height); |
| params.GetDouble(guestview::kElementWidth, &element_width); |
| - // Convert the element size from logical pixels to physical pixels. |
| - int normal_height = LogicalPixelsToPhysicalPixels(element_height); |
| - int normal_width = LogicalPixelsToPhysicalPixels(element_width); |
| + |
| + // If the element size was provided in logical units (versus physical), then |
| + // it will be converted to physical units. |
| + bool element_size_is_logical = false; |
| + if (params.HasKey(guestview::kElementSizeIsLogical)) { |
|
Fady Samuel
2015/03/03 17:50:58
This check seems unnecessary. Just call GetBoolean
paulmeyer
2015/03/03 20:36:23
Done.
|
| + params.GetBoolean(guestview::kElementSizeIsLogical, |
| + &element_size_is_logical); |
| + } |
| + int normal_height = 0; |
| + int normal_width = 0; |
| + if (element_size_is_logical) { |
| + // Convert the element size from logical pixels to physical pixels. |
| + normal_height = LogicalPixelsToPhysicalPixels(element_height); |
| + normal_width = LogicalPixelsToPhysicalPixels(element_width); |
| + } else { |
| + normal_height = lround(element_height); |
| + normal_width = lround(element_width); |
| + } |
| SetSizeParams set_size_params; |
| set_size_params.enable_auto_size.reset(new bool(auto_size_enabled)); |