diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 11:53:10 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 11:53:10 +0000 |
| commit | 9677887f50d3f4d3e8ec7b60951cf239dfb04d54 (patch) | |
| tree | 2d2546e169e7784e835931418d6837dbf34d0ac4 /athena/wm | |
| parent | 14de4c4054747c660485949688ad3d0b005c5c43 (diff) | |
| download | chromium_src-9677887f50d3f4d3e8ec7b60951cf239dfb04d54.zip chromium_src-9677887f50d3f4d3e8ec7b60951cf239dfb04d54.tar.gz chromium_src-9677887f50d3f4d3e8ec7b60951cf239dfb04d54.tar.bz2 | |
athena: Create WMState.
The wm::WMState object takes care of setting up some window-manager related
functionality (e.g. window-stacking client, transient-window client). So
create WMState from the WindowManager implementation in athena.
BUG=400961, 386350
R=mukai@chromium.org
Review URL: https://codereview.chromium.org/442193003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/wm')
| -rw-r--r-- | athena/wm/window_manager_impl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc index 51c1e60..fb06188 100644 --- a/athena/wm/window_manager_impl.cc +++ b/athena/wm/window_manager_impl.cc @@ -16,6 +16,7 @@ #include "ui/aura/layout_manager.h" #include "ui/aura/window.h" #include "ui/wm/core/window_util.h" +#include "ui/wm/core/wm_state.h" #include "ui/wm/public/window_types.h" namespace athena { @@ -64,6 +65,7 @@ class WindowManagerImpl : public WindowManager, scoped_ptr<WindowOverviewMode> overview_; scoped_ptr<BezelController> bezel_controller_; scoped_ptr<SplitViewController> split_view_controller_; + scoped_ptr<wm::WMState> wm_state_; ObserverList<WindowManagerObserver> observers_; DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); @@ -100,6 +102,7 @@ WindowManagerImpl::WindowManagerImpl() { split_view_controller_.reset(new SplitViewController()); bezel_controller_->set_left_right_delegate(split_view_controller_.get()); container_->AddPreTargetHandler(bezel_controller_.get()); + wm_state_.reset(new wm::WMState()); instance = this; InstallAccelerators(); } |