Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / ash / shell.cc

diff --git a/src/ash/shell.cc b/src/ash/shell.cc
index 53b051d..00f6137 100644 (file)
--- a/src/ash/shell.cc
+++ b/src/ash/shell.cc
@@ -11,6 +11,7 @@
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/focus_manager_factory.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
+#include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ -58,6 +59,7 @@
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/lock_state_controller.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overlay_event_filter.h"
@@ -606,6 +608,7 @@ Shell::Shell(ShellDelegate* delegate)
       delegate_(delegate),
       window_positioner_(new WindowPositioner),
       activation_client_(NULL),
+      accelerometer_controller_(new AccelerometerController()),
 #if defined(OS_CHROMEOS) && defined(USE_X11)
       output_configurator_(new ui::OutputConfigurator()),
 #endif  // defined(OS_CHROMEOS) && defined(USE_X11)
@@ -666,6 +669,7 @@ Shell::~Shell() {
 
   // Destroy maximize window manager early on since it has some observers which
   // need to be removed.
+  maximize_mode_controller_.reset();
   maximize_mode_window_manager_.reset();
 
   // AppList needs to be released before shelf layout manager, which is
@@ -859,6 +863,7 @@ void Shell::Init() {
 
   nested_dispatcher_controller_.reset(new NestedDispatcherController);
   accelerator_controller_.reset(new AcceleratorController);
+  maximize_mode_controller_.reset(new MaximizeModeController());
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
   magnifier_key_scroll_handler_ = MagnifierKeyScroller::CreateHandler().Pass();