| Index: athena/wm/window_manager_impl.cc
|
| diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
|
| index 589da390733ec1ecf3999c24c0b16278b8b5d35c..04d7a05b88381140f9110dc9fc1eb261795d5fb0 100644
|
| --- a/athena/wm/window_manager_impl.cc
|
| +++ b/athena/wm/window_manager_impl.cc
|
| @@ -5,6 +5,8 @@
|
| #include "athena/wm/public/window_manager.h"
|
|
|
| #include "athena/screen/public/screen_manager.h"
|
| +#include "athena/wm/bezel_controller.h"
|
| +#include "athena/wm/split_view_controller.h"
|
| #include "athena/wm/window_overview_mode.h"
|
| #include "base/logging.h"
|
| #include "ui/aura/layout_manager.h"
|
| @@ -48,6 +50,8 @@ class WindowManagerImpl : public WindowManager,
|
| scoped_ptr<aura::Window> container_;
|
| scoped_ptr<ui::EventHandler> temp_handler_;
|
| scoped_ptr<WindowOverviewMode> overview_;
|
| + scoped_ptr<BezelController> bezel_controller_;
|
| + scoped_ptr<SplitViewController> split_view_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
|
| };
|
| @@ -101,10 +105,14 @@ class TempEventHandler : public ui::EventHandler {
|
|
|
| WindowManagerImpl::WindowManagerImpl()
|
| : container_(ScreenManager::Get()->CreateDefaultContainer("MainContainer")),
|
| - temp_handler_(new TempEventHandler()) {
|
| + temp_handler_(new TempEventHandler()),
|
| + bezel_controller_(new BezelController(container_.get())),
|
| + split_view_controller_(new SplitViewController()) {
|
| container_->SetLayoutManager(new AthenaContainerLayoutManager);
|
| container_->AddObserver(this);
|
| container_->AddPreTargetHandler(temp_handler_.get());
|
| + container_->AddPreTargetHandler(bezel_controller_.get());
|
| + bezel_controller_->set_left_right_delegate(split_view_controller_.get());
|
| instance = this;
|
| }
|
|
|
|
|