| Index: ui/wm/core/default_screen_position_client.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_screen_position_client.h b/ui/wm/core/default_screen_position_client.h
|
| similarity index 58%
|
| copy from ui/views/widget/desktop_aura/desktop_screen_position_client.h
|
| copy to ui/wm/core/default_screen_position_client.h
|
| index 890a5c1c90dbf599543a5149fa3e95cf3d88b444..b27c91f2c19ffac4facbc38b62e0a0ff907857bb 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_screen_position_client.h
|
| +++ b/ui/wm/core/default_screen_position_client.h
|
| @@ -1,22 +1,22 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_
|
| -#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_
|
| +#ifndef UI_WM_CORE_DEFAULT_SCREEN_POSITION_CLIENT_H_
|
| +#define UI_WM_CORE_DEFAULT_SCREEN_POSITION_CLIENT_H_
|
|
|
| #include "ui/aura/client/screen_position_client.h"
|
| -#include "ui/views/views_export.h"
|
| +#include "ui/wm/wm_export.h"
|
|
|
| -namespace views {
|
| +namespace wm {
|
|
|
| // Client that always offsets by the toplevel RootWindow of the passed
|
| // in child NativeWidgetAura.
|
| -class VIEWS_EXPORT DesktopScreenPositionClient
|
| +class WM_EXPORT DefaultScreenPositionClient
|
| : public aura::client::ScreenPositionClient {
|
| public:
|
| - explicit DesktopScreenPositionClient(aura::Window* root_window);
|
| - ~DesktopScreenPositionClient() override;
|
| + DefaultScreenPositionClient();
|
| + ~DefaultScreenPositionClient() override;
|
|
|
| // aura::client::ScreenPositionClient overrides:
|
| void ConvertPointToScreen(const aura::Window* window,
|
| @@ -29,12 +29,14 @@ class VIEWS_EXPORT DesktopScreenPositionClient
|
| const gfx::Rect& bounds,
|
| const gfx::Display& display) override;
|
|
|
| - private:
|
| - aura::Window* root_window_;
|
| + protected:
|
| + // Returns the origin of the host platform-window in system pixel coordinates.
|
| + gfx::Point GetOriginInScreen(const aura::Window* root_window);
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(DesktopScreenPositionClient);
|
| + private:
|
| + DISALLOW_COPY_AND_ASSIGN(DefaultScreenPositionClient);
|
| };
|
|
|
| -} // namespace views
|
| +} // namespace wm
|
|
|
| -#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_
|
| +#endif // UI_WM_CORE_DEFAULT_SCREEN_POSITION_CLIENT_H_
|
|
|