Chromium Code Reviews| Index: ash/accelerators/accelerator_controller.cc |
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc |
| index 96ee265d23b84e862c260c41ea42eceaa55c1b82..37d74d8ea7e03a7964e84d8a8104df15c186b9a2 100644 |
| --- a/ash/accelerators/accelerator_controller.cc |
| +++ b/ash/accelerators/accelerator_controller.cc |
| @@ -44,6 +44,7 @@ |
| #include "ash/system/web_notification/web_notification_tray.h" |
| #include "ash/touch/touch_hud_debug.h" |
| #include "ash/volume_control_delegate.h" |
| +#include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| #include "ash/wm/mru_window_tracker.h" |
| #include "ash/wm/overview/window_selector_controller.h" |
| #include "ash/wm/partial_screenshot_view.h" |
| @@ -71,7 +72,6 @@ |
| #include "ui/views/widget/widget.h" |
| #if defined(OS_CHROMEOS) |
| -#include "ash/session/session_state_delegate.h" |
| #include "ash/system/chromeos/keyboard_brightness_controller.h" |
| #include "base/sys_info.h" |
| #include "chromeos/ime/ime_keyboard.h" |
| @@ -597,8 +597,9 @@ bool HandleToggleTouchViewTesting() { |
| if (CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kAshEnableTouchViewTesting)) { |
| Shell* shell = Shell::GetInstance(); |
|
flackr
2014/05/29 16:10:06
nit: Don't bother saving Shell* since it's only us
jonross
2014/05/29 17:40:00
Done.
|
| - shell->EnableMaximizeModeWindowManager( |
| - !shell->IsMaximizeModeWindowManagerEnabled()); |
| + MaximizeModeController* controller = shell->maximize_mode_controller(); |
| + controller->EnableMaximizeModeWindowManager( |
| + !controller->IsMaximizeModeWindowManagerEnabled()); |
| return true; |
| } |
| return false; |