summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller.h
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 /ash/root_window_controller.h
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 'ash/root_window_controller.h')
-rw-r--r--ash/root_window_controller.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index e9f6b8e..6199a5c 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -47,6 +47,7 @@ class ScopedCaptureClient;
}
namespace ash {
+class AshWindowTreeHost;
class AlwaysOnTopController;
class AnimatingDesktopController;
class DesktopBackgroundWidgetController;
@@ -80,14 +81,14 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
public:
// Creates and Initialize the RootWindowController for primary display.
- static void CreateForPrimaryDisplay(aura::WindowTreeHost* host);
+ static void CreateForPrimaryDisplay(AshWindowTreeHost* host);
// Creates and Initialize the RootWindowController for secondary displays.
- static void CreateForSecondaryDisplay(aura::WindowTreeHost* host);
+ static void CreateForSecondaryDisplay(AshWindowTreeHost* host);
// Creates and Initialize the RootWindowController for virtual
// keyboard displays.
- static void CreateForVirtualKeyboardDisplay(aura::WindowTreeHost* host);
+ static void CreateForVirtualKeyboardDisplay(AshWindowTreeHost* host);
// Returns a RootWindowController that has a shelf for given
// |window|. This returns the RootWindowController for the |window|'s
@@ -106,10 +107,13 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
virtual ~RootWindowController();
- aura::Window* root_window() { return host_->window(); }
- const aura::Window* root_window() const { return host_->window(); }
- aura::WindowTreeHost* host() { return host_.get(); }
- const aura::WindowTreeHost* host() const { return host_.get(); }
+ AshWindowTreeHost* ash_host() { return ash_host_.get(); }
+ const AshWindowTreeHost* ash_host() const { return ash_host_.get(); }
+
+ aura::WindowTreeHost* GetHost();
+ const aura::WindowTreeHost* GetHost() const;
+ aura::Window* GetRootWindow();
+ const aura::Window* GetRootWindow() const;
RootWindowLayoutManager* root_window_layout() { return root_window_layout_; }
@@ -235,7 +239,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
bool IsVirtualKeyboardWindow(aura::Window* window);
private:
- explicit RootWindowController(aura::WindowTreeHost* host);
+ explicit RootWindowController(AshWindowTreeHost* host);
enum RootWindowType {
PRIMARY,
SECONDARY,
@@ -267,7 +271,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;
virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE;
- scoped_ptr<aura::WindowTreeHost> host_;
+ scoped_ptr<AshWindowTreeHost> ash_host_;
RootWindowLayoutManager* root_window_layout_;
scoped_ptr<StackingController> stacking_controller_;