ash/wm/maximize_mode/maximize_mode_controller.cc - Issue 806693009: Port ScopedDisableInternalMouseAndKeyboardX11 to Ozone

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 806693009: Port ScopedDisableInternalMouseAndKeyboardX11 to Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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/ash.gyp ('k') | ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h » ('j') | ui/events/ozone/evdev/event_converter_evdev_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 511df7b94d65201e23329e30b5aea7c71f6ed56b..94d21dbc9b3730d90213f9ff61cfc5d302b59cd3 100644

--- a/ash/wm/maximize_mode/maximize_mode_controller.cc

+++ b/ash/wm/maximize_mode/maximize_mode_controller.cc

@@ -25,6 +25,10 @@

#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"

#endif

+#if defined(USE_OZONE)

+#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"

+#endif

#if defined(OS_CHROMEOS)

#include "chromeos/dbus/dbus_thread_manager.h"

#endif // OS_CHROMEOS

@@ -337,6 +341,8 @@ void MaximizeModeController::HandleHingeRotation(const gfx::Vector3dF& base,

}

#if defined(USE_X11)

event_blocker_.reset(new ScopedDisableInternalMouseAndKeyboardX11);

+#elif defined(USE_OZONE)

+ event_blocker_.reset(new ScopedDisableInternalMouseAndKeyboardOzone);

#endif

}