mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Wrap X11 headers in ui/gfx/x/x11.h

Browse source 
https://chromium-review.googlesource.com/756711
This commit is contained in:
Aleksei Kuzmin 2018-04-18 18:52:58 +02:00 • committed by Samuel Attard
parent 97414cc931
commit 82d204e932
7 changed files with 15 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc
View file

@ -11,6 +11,7 @@
#include "ui/base/accelerators/accelerator.h"
#include "ui/events/keycodes/keyboard_code_conversion_x.h"
#include "ui/events/platform/platform_event_source.h"
#include "ui/gfx/x/x11.h"
#include "ui/gfx/x/x11_error_tracker.h"
#include "ui/gfx/x/x11_types.h"
@ -111,7 +112,7 @@ bool GlobalShortcutListenerX11::RegisterAcceleratorImpl(
// Caps lock, Scroll lock. See comment about |kModifiersMasks|.
for (size_t i = 0; i < arraysize(kModifiersMasks); ++i) {
XGrabKey(x_display_, keycode, modifiers | kModifiersMasks[i],
x_root_window_, False, GrabModeAsync, GrabModeAsync);
x_root_window_, x11::False, GrabModeAsync, GrabModeAsync);
}
if (err_tracker.FoundNewError()) {

2
chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h
View file

@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_
#define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_
#include <X11/Xlib.h>
#include <stdint.h>
#include <set>
@ -13,6 +12,7 @@
#include "base/macros.h"
#include "chrome/browser/extensions/global_shortcut_listener.h"
#include "ui/events/platform/platform_event_dispatcher.h"
#include "ui/gfx/x/x11.h"
namespace extensions {