| Index: ash/wm/maximize_mode/maximize_mode_controller.h
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_controller.h b/ash/wm/maximize_mode/maximize_mode_controller.h
|
| index 8445bfa50acc4819604dcf9163136fe09a4fd3e8..54db3f3a48539de4f53fb4781960be6b52876918 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_controller.h
|
| +++ b/ash/wm/maximize_mode/maximize_mode_controller.h
|
| @@ -23,7 +23,7 @@ class EventHandler;
|
| namespace ash {
|
|
|
| class MaximizeModeControllerTest;
|
| -class MaximizeModeEventBlocker;
|
| +class ScopedDisableInternalMouseAndKeyboard;
|
| class MaximizeModeWindowManager;
|
| class MaximizeModeWindowManagerTest;
|
|
|
| @@ -136,9 +136,9 @@ class ASH_EXPORT MaximizeModeController : public AccelerometerObserver,
|
| // The maximized window manager (if enabled).
|
| scoped_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;
|
|
|
| - // An event targeter controller which traps mouse and keyboard events while
|
| - // maximize mode is engaged.
|
| - scoped_ptr<MaximizeModeEventBlocker> event_blocker_;
|
| + // A helper class which when instantiated will block native events from the
|
| + // internal keyboard and touchpad.
|
| + scoped_ptr<ScopedDisableInternalMouseAndKeyboard> event_blocker_;
|
|
|
| // An event handler used to detect screenshot actions while in maximize mode.
|
| scoped_ptr<ui::EventHandler> event_handler_;
|
|
|