summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 08:13:45 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 08:13:45 +0000
commitf5c9dbcb852de1cd6ce1bd293920c8c64a7ad9d9 (patch)
tree57061cf0622e2b9edee2428ac332de8967bccdea /mojo
parent728f28f2dfd7e22a414a8657229af008a19d7a9d (diff)
downloadchromium_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 'mojo')
-rw-r--r--mojo/examples/aura_demo/window_tree_host_mojo.cc22
-rw-r--r--mojo/examples/aura_demo/window_tree_host_mojo.h5
2 files changed, 0 insertions, 27 deletions
diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.cc b/mojo/examples/aura_demo/window_tree_host_mojo.cc
index b266ca9..7a5bd4e 100644
--- a/mojo/examples/aura_demo/window_tree_host_mojo.cc
+++ b/mojo/examples/aura_demo/window_tree_host_mojo.cc
@@ -71,10 +71,6 @@ void WindowTreeHostMojo::Hide() {
window()->Hide();
}
-void WindowTreeHostMojo::ToggleFullScreen() {
- NOTIMPLEMENTED();
-}
-
gfx::Rect WindowTreeHostMojo::GetBounds() const {
return bounds_;
}
@@ -84,15 +80,6 @@ void WindowTreeHostMojo::SetBounds(const gfx::Rect& bounds) {
native_viewport_->SetBounds(bounds);
}
-gfx::Insets WindowTreeHostMojo::GetInsets() const {
- NOTIMPLEMENTED();
- return gfx::Insets();
-}
-
-void WindowTreeHostMojo::SetInsets(const gfx::Insets& insets) {
- NOTIMPLEMENTED();
-}
-
gfx::Point WindowTreeHostMojo::GetLocationOnNativeScreen() const {
return gfx::Point(0, 0);
}
@@ -110,15 +97,6 @@ bool WindowTreeHostMojo::QueryMouseLocation(gfx::Point* location_return) {
return false;
}
-bool WindowTreeHostMojo::ConfineCursorToRootWindow() {
- NOTIMPLEMENTED();
- return false;
-}
-
-void WindowTreeHostMojo::UnConfineCursor() {
- NOTIMPLEMENTED();
-}
-
void WindowTreeHostMojo::PostNativeEvent(
const base::NativeEvent& native_event) {
NOTIMPLEMENTED();
diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.h b/mojo/examples/aura_demo/window_tree_host_mojo.h
index 538c16d..80d178c 100644
--- a/mojo/examples/aura_demo/window_tree_host_mojo.h
+++ b/mojo/examples/aura_demo/window_tree_host_mojo.h
@@ -36,17 +36,12 @@ class WindowTreeHostMojo : public aura::WindowTreeHost,
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;