Chromium Code Reviews| Index: services/ui/public/cpp/window_tree_client.cc |
| diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc |
| index d708659579205421d5a12514b49c8d8151ff75d5..22f6e9a087f77346ef2bfa23ec24f88601c212fd 100644 |
| --- a/services/ui/public/cpp/window_tree_client.cc |
| +++ b/services/ui/public/cpp/window_tree_client.cc |
| @@ -1316,22 +1316,17 @@ void WindowTreeClient::WmSetBounds(uint32_t change_id, |
| Id window_id, |
| const gfx::Rect& transit_bounds) { |
| Window* window = GetWindowByServerId(window_id); |
| - bool result = false; |
| if (window) { |
| DCHECK(window_manager_delegate_); |
| gfx::Rect transit_bounds_in_dip = gfx::ConvertRectToDIP( |
| ScaleFactorForDisplay(window->display_id()), transit_bounds); |
| - gfx::Rect bounds = transit_bounds_in_dip; |
| - result = window_manager_delegate_->OnWmSetBounds(window, &bounds); |
| - if (result) { |
| - // If the resulting bounds differ return false. Returning false ensures |
| - // the client applies the bounds we set below. |
| - result = bounds == transit_bounds_in_dip; |
| - window->SetBounds(bounds); |
| - } |
| + window_manager_delegate_->OnWmSetBounds(window, transit_bounds_in_dip); |
| } |
| + |
| + // Returning false ensures the client applies the bounds we set above in the |
|
mfomitchev
2016/12/08 20:44:23
"the bounds which the |window_manager_delegate_| s
|
| + // delegate. |
| if (window_manager_internal_client_) |
| - window_manager_internal_client_->WmResponse(change_id, result); |
| + window_manager_internal_client_->WmResponse(change_id, false); |
| } |
| void WindowTreeClient::WmSetProperty( |