Index: ui/views/widget/desktop_aura/desktop_screen_position_client.h |
diff --git a/ui/views/widget/desktop_aura/desktop_screen_position_client.h b/ui/views/widget/desktop_aura/desktop_screen_position_client.h |
index 890a5c1c90dbf599543a5149fa3e95cf3d88b444..929c7fabf3cbe9f0b9868d1e00c66bb59b5657cb 100644 |
--- a/ui/views/widget/desktop_aura/desktop_screen_position_client.h |
+++ b/ui/views/widget/desktop_aura/desktop_screen_position_client.h |
@@ -5,30 +5,27 @@ |
#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_ |
#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_ |
-#include "ui/aura/client/screen_position_client.h" |
#include "ui/views/views_export.h" |
+#include "ui/wm/core/default_screen_position_client.h" |
namespace views { |
// Client that always offsets by the toplevel RootWindow of the passed |
// in child NativeWidgetAura. |
class VIEWS_EXPORT DesktopScreenPositionClient |
- : public aura::client::ScreenPositionClient { |
+ : public wm::DefaultScreenPositionClient { |
public: |
explicit DesktopScreenPositionClient(aura::Window* root_window); |
~DesktopScreenPositionClient() override; |
- // aura::client::ScreenPositionClient overrides: |
- void ConvertPointToScreen(const aura::Window* window, |
- gfx::Point* point) override; |
- void ConvertPointFromScreen(const aura::Window* window, |
- gfx::Point* point) override; |
- void ConvertHostPointToScreen(aura::Window* window, |
- gfx::Point* point) override; |
+ // aura::client::DefaultScreenPositionClient: |
void SetBounds(aura::Window* window, |
const gfx::Rect& bounds, |
const gfx::Display& display) override; |
+ protected: |
+ bool PositionWindowInScreenCoordinates(aura::Window* window) override; |
+ |
private: |
aura::Window* root_window_; |