| Index: ash/wm/maximize_mode/maximize_mode_controller.cc
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| index a32812ab46688111e7ac0db0724142e5431a6dc9..36f6f2514ca137a01e7595f34a8e5176994367ae 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| +++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| @@ -10,8 +10,8 @@
|
| #include "ash/ash_switches.h"
|
| #include "ash/display/display_manager.h"
|
| #include "ash/shell.h"
|
| -#include "ash/wm/maximize_mode/maximize_mode_event_blocker.h"
|
| #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
|
| +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
|
| #include "base/auto_reset.h"
|
| #include "base/command_line.h"
|
| #include "base/metrics/histogram.h"
|
| @@ -21,6 +21,10 @@
|
| #include "ui/events/keycodes/keyboard_codes.h"
|
| #include "ui/gfx/vector3d_f.h"
|
|
|
| +#if defined(USE_X11)
|
| +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
|
| +#endif
|
| +
|
| namespace ash {
|
|
|
| namespace {
|
| @@ -350,7 +354,9 @@ void MaximizeModeController::EnterMaximizeMode() {
|
| current_rotation_ = user_rotation_ = display_manager->
|
| GetDisplayInfo(gfx::Display::InternalDisplayId()).rotation();
|
| EnableMaximizeModeWindowManager(true);
|
| - event_blocker_.reset(new MaximizeModeEventBlocker);
|
| +#if defined(USE_X11)
|
| + event_blocker_.reset(new ScopedDisableInternalMouseAndKeyboardX11);
|
| +#endif
|
| #if defined(OS_CHROMEOS)
|
| event_handler_.reset(new ScreenshotActionHandler);
|
| #endif
|
|
|