diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 03:28:05 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 03:28:05 +0000 |
| commit | 58fb353df9d0b85e92cc0a706f29fd049dc9528c (patch) | |
| tree | 9678c7755c838edad9ad51bab36a84785d45f0ab /ash/shell.cc | |
| parent | fa8fe26a3309d7eb34b03e45a3dafc0c4b16bfe9 (diff) | |
| download | chromium_src-58fb353df9d0b85e92cc0a706f29fd049dc9528c.zip chromium_src-58fb353df9d0b85e92cc0a706f29fd049dc9528c.tar.gz chromium_src-58fb353df9d0b85e92cc0a706f29fd049dc9528c.tar.bz2 | |
Enable maximize mode when keyboard is open past 180 degrees.
BUG=342911
TEST=MaximizeModeControllerTest.*
TEST=Open keyboard past 180 degrees, device should auto-enter maximize mode.
Review URL: https://codereview.chromium.org/197883011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index f449d3e..f297ca2 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -59,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" @@ -661,6 +662,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 @@ -852,6 +854,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(); |