Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2717)

Unified Diff: athena/wm/window_manager_impl.cc

Issue 442193003: athena: Create WMState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_manager_impl.cc
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
index 51c1e60bb7d302f2ff424bc6b9a53cc75c15949d..fb06188a4ec86ea6e7e679e84697993ae49326d1 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();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698