diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 08:13:45 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 08:13:45 +0000 |
commit | f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9 (patch) | |
tree | 57061cf0622e2b9edee2428ac332de8967bccdea /ui/views | |
parent | 728f28f2dfd7e22a414a8657229af008a19d7a9d (diff) | |
download | chromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.zip chromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.tar.gz chromium_src-f5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9.tar.bz2 |
Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.
Other notable changes:
* Removed WindowTreeHostFactory as this is no longer necessary.
* Moved RootWindowTransformer to ash/host
* Removed Set/GetInsets which are no longer necessary (a code in SetInsets is now a part of
SetRootWindowTransformer)
* Added TransformerHelper that implements common behavior to transform root window for AshWindowTreeHost
* Added DEPS files
* Updated metro_viewer code to make sure it creates ash::AshRemoteWindowHostTree
A few more simplifications to come:
* Simplify RootWindowTransformer
* Eliminate EnvObserver in AshWindowTreeHostX11
I'll also work on DEPS reorg to make it more explicit under ash/
BUG=355771
TEST=No functional change. ui/aura/window_tree_host_x11_unittests has been moved to ash/host/ash_window_tree_host_x11_unittests
Review URL: https://codereview.chromium.org/201573015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
4 files changed, 0 insertions, 51 deletions
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc index 2fc499b..ebbd14b 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -449,10 +449,6 @@ void DesktopWindowTreeHostWin::Hide() { message_handler_->Hide(); } -void DesktopWindowTreeHostWin::ToggleFullScreen() { - SetWindowTransparency(); -} - // GetBounds and SetBounds work in pixel coordinates, whereas other get/set // methods work in DIP. @@ -500,13 +496,6 @@ void DesktopWindowTreeHostWin::SetBounds(const gfx::Rect& bounds) { HandleClientSizeChanged(new_expanded.size()); } -gfx::Insets DesktopWindowTreeHostWin::GetInsets() const { - return gfx::Insets(); -} - -void DesktopWindowTreeHostWin::SetInsets(const gfx::Insets& insets) { -} - gfx::Point DesktopWindowTreeHostWin::GetLocationOnNativeScreen() const { return GetBounds().origin(); } @@ -533,16 +522,6 @@ bool DesktopWindowTreeHostWin::QueryMouseLocation(gfx::Point* location_return) { return true; } -bool DesktopWindowTreeHostWin::ConfineCursorToRootWindow() { - RECT window_rect = window()->GetBoundsInScreen().ToRECT(); - ::ClipCursor(&window_rect); - return true; -} - -void DesktopWindowTreeHostWin::UnConfineCursor() { - ::ClipCursor(NULL); -} - void DesktopWindowTreeHostWin::PostNativeEvent( const base::NativeEvent& native_event) { } diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h index dc8a218..95044e3 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h @@ -109,17 +109,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; virtual void Show() OVERRIDE; virtual void Hide() OVERRIDE; - virtual void ToggleFullScreen() OVERRIDE; virtual gfx::Rect GetBounds() const OVERRIDE; virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual void SetInsets(const gfx::Insets& insets) OVERRIDE; virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; virtual void SetCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE; virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE; - virtual bool ConfineCursorToRootWindow() OVERRIDE; - virtual void UnConfineCursor() OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc index 028b6f5..ed7ca42 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -762,10 +762,6 @@ void DesktopWindowTreeHostX11::Hide() { native_widget_delegate_->OnNativeWidgetVisibilityChanged(false); } -void DesktopWindowTreeHostX11::ToggleFullScreen() { - NOTIMPLEMENTED(); -} - gfx::Rect DesktopWindowTreeHostX11::GetBounds() const { return bounds_; } @@ -809,13 +805,6 @@ void DesktopWindowTreeHostX11::SetBounds(const gfx::Rect& bounds) { compositor()->ScheduleRedrawRect(gfx::Rect(bounds.size())); } -gfx::Insets DesktopWindowTreeHostX11::GetInsets() const { - return gfx::Insets(); -} - -void DesktopWindowTreeHostX11::SetInsets(const gfx::Insets& insets) { -} - gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const { return bounds_.origin(); } @@ -867,15 +856,6 @@ bool DesktopWindowTreeHostX11::QueryMouseLocation( win_y_return >= 0 && win_y_return < bounds_.height()); } -bool DesktopWindowTreeHostX11::ConfineCursorToRootWindow() { - NOTIMPLEMENTED(); - return false; -} - -void DesktopWindowTreeHostX11::UnConfineCursor() { - NOTIMPLEMENTED(); -} - void DesktopWindowTreeHostX11::SetCursorNative(gfx::NativeCursor cursor) { XDefineCursor(xdisplay_, xwindow_, cursor.platform()); } diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h index bc20464..f08d207 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h @@ -133,17 +133,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; virtual void Show() OVERRIDE; virtual void Hide() OVERRIDE; - virtual void ToggleFullScreen() OVERRIDE; virtual gfx::Rect GetBounds() const OVERRIDE; virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; - virtual void SetInsets(const gfx::Insets& insets) OVERRIDE; virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; virtual void SetCapture() OVERRIDE; virtual void ReleaseCapture() OVERRIDE; virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE; - virtual bool ConfineCursorToRootWindow() OVERRIDE; - virtual void UnConfineCursor() OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; |