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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1412623006: Developer Feature: Add Debug Accelerators to Toggle Touchscreen/Touchpad On or Off (CrOS) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sadrul's comment Created 5 years, 1 month 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
« no previous file with comments | « ash/shell_delegate.h ('k') | ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h » ('j') | ui/events/base_event_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 50403ec7daeecb7bb4c347de80b3061cb4774c3f..c7328631c62b228c6019019acf5a01b64028eb42 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -301,6 +301,9 @@ void MaximizeModeController::HandleHingeRotation(
HasSwitch(switches::kAshEnableTouchViewTesting)) {
EnterMaximizeMode();
}
+ // Always reset first to avoid creation before destruction of a previous
+ // object.
+ event_blocker_.reset();
#if defined(USE_X11)
event_blocker_.reset(new ScopedDisableInternalMouseAndKeyboardX11);
#elif defined(USE_OZONE)
« no previous file with comments | « ash/shell_delegate.h ('k') | ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h » ('j') | ui/events/base_event_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698