| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/aura/mus/window_tree_client.h" | 5 #include "ui/aura/mus/window_tree_client.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1614 window_manager_internal_client_->RemoveActivationParent( | 1614 window_manager_internal_client_->RemoveActivationParent( |
| 1615 WindowMus::Get(window)->server_id()); | 1615 WindowMus::Get(window)->server_id()); |
| 1616 } | 1616 } |
| 1617 } | 1617 } |
| 1618 | 1618 |
| 1619 void WindowTreeClient::ActivateNextWindow() { | 1619 void WindowTreeClient::ActivateNextWindow() { |
| 1620 if (window_manager_internal_client_) | 1620 if (window_manager_internal_client_) |
| 1621 window_manager_internal_client_->ActivateNextWindow(); | 1621 window_manager_internal_client_->ActivateNextWindow(); |
| 1622 } | 1622 } |
| 1623 | 1623 |
| 1624 void WindowTreeClient::SetUnderlaySurfaceOffsetAndExtendedHitArea( | 1624 void WindowTreeClient::SetExtendedHitArea(Window* window, |
| 1625 Window* window, | 1625 const gfx::Insets& hit_area) { |
| 1626 const gfx::Vector2d& offset, | |
| 1627 const gfx::Insets& hit_area) { | |
| 1628 if (window_manager_internal_client_) { | 1626 if (window_manager_internal_client_) { |
| 1629 float device_scale_factor = ScaleFactorForDisplay(window); | 1627 float device_scale_factor = ScaleFactorForDisplay(window); |
| 1630 gfx::Vector2dF offset_in_pixels = | 1628 window_manager_internal_client_->SetExtendedHitArea( |
| 1631 gfx::ScaleVector2d(offset, device_scale_factor); | 1629 WindowMus::Get(window)->server_id(), |
| 1632 window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea( | |
| 1633 WindowMus::Get(window)->server_id(), offset_in_pixels.x(), | |
| 1634 offset_in_pixels.y(), | |
| 1635 gfx::ConvertInsetsToPixel(device_scale_factor, hit_area)); | 1630 gfx::ConvertInsetsToPixel(device_scale_factor, hit_area)); |
| 1636 } | 1631 } |
| 1637 } | 1632 } |
| 1638 | 1633 |
| 1639 void WindowTreeClient::RequestClose(Window* window) { | 1634 void WindowTreeClient::RequestClose(Window* window) { |
| 1640 DCHECK(window); | 1635 DCHECK(window); |
| 1641 if (window_manager_internal_client_) | 1636 if (window_manager_internal_client_) |
| 1642 window_manager_internal_client_->WmRequestClose( | 1637 window_manager_internal_client_->WmRequestClose( |
| 1643 WindowMus::Get(window)->server_id()); | 1638 WindowMus::Get(window)->server_id()); |
| 1644 } | 1639 } |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1836 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( | 1831 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( |
| 1837 this, capture_synchronizer_.get(), window)); | 1832 this, capture_synchronizer_.get(), window)); |
| 1838 } | 1833 } |
| 1839 | 1834 |
| 1840 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { | 1835 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { |
| 1841 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( | 1836 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( |
| 1842 this, focus_synchronizer_.get(), window)); | 1837 this, focus_synchronizer_.get(), window)); |
| 1843 } | 1838 } |
| 1844 | 1839 |
| 1845 } // namespace aura | 1840 } // namespace aura |
| OLD | NEW |