Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

Unified Diff: ash/wm/maximize_mode/maximize_mode_controller.cc

Issue 313913004: Block internal PlatformEvents before they are dispatched in touchview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Block events from disabled devices through DeviceDataManager. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 80a94a3d0e468f73d83d8f21520f4af8886913b0..583943d218707944b895c6e396f0f11f9f079bb1 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -10,7 +10,6 @@
#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 "base/auto_reset.h"
#include "base/command_line.h"
@@ -20,6 +19,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 {
@@ -313,7 +316,9 @@ void MaximizeModeController::EnterMaximizeMode() {
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

Powered by Google App Engine
This is Rietveld 408576698