diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/ui/views/widget/desktop_aura/x11_window_event_filter.cc | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/ui/views/widget/desktop_aura/x11_window_event_filter.cc')
| -rw-r--r-- | chromium/ui/views/widget/desktop_aura/x11_window_event_filter.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chromium/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/chromium/ui/views/widget/desktop_aura/x11_window_event_filter.cc index 3495b04bc58..740e1204df0 100644 --- a/chromium/ui/views/widget/desktop_aura/x11_window_event_filter.cc +++ b/chromium/ui/views/widget/desktop_aura/x11_window_event_filter.cc @@ -9,13 +9,12 @@ #include <X11/Xatom.h> #include <X11/Xlib.h> -#include "base/message_loop/message_pump_aurax11.h" #include "ui/aura/root_window.h" #include "ui/aura/window_delegate.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_utils.h" #include "ui/base/hit_test.h" -#include "ui/views/widget/desktop_aura/desktop_activation_client.h" +#include "ui/events/event.h" +#include "ui/events/event_utils.h" +#include "ui/gfx/x/x11_types.h" #include "ui/views/widget/native_widget_aura.h" namespace { @@ -59,10 +58,8 @@ const char* kAtomsToCache[] = { namespace views { X11WindowEventFilter::X11WindowEventFilter( - aura::RootWindow* root_window, - DesktopActivationClient* activation_client) - : activation_client_(activation_client), - xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()), + aura::RootWindow* root_window) + : xdisplay_(gfx::GetXDisplay()), xwindow_(root_window->GetAcceleratedWidget()), x_root_window_(DefaultRootWindow(xdisplay_)), atom_cache_(xdisplay_, kAtomsToCache), @@ -79,7 +76,7 @@ void X11WindowEventFilter::SetUseHostWindowBorders(bool use_os_border) { motif_hints.decorations = use_os_border ? 1 : 0; ::Atom hint_atom = atom_cache_.GetAtom("_MOTIF_WM_HINTS"); - XChangeProperty(base::MessagePumpAuraX11::GetDefaultXDisplay(), + XChangeProperty(gfx::GetXDisplay(), xwindow_, hint_atom, hint_atom, |