| Index: ui/views/widget/desktop_aura/desktop_screen_x11.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.cc b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
|
| index 17145e383fbf2d46be90e37fc23d06c332a9c545..d7b8a3352778e20ea2fe458e4ff39f23f7832ef2 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
|
| @@ -27,6 +27,7 @@
|
| #include "ui/gfx/geometry/point_conversions.h"
|
| #include "ui/gfx/geometry/size_conversions.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| +#include "ui/gfx/x/x11_atom_cache.h"
|
| #include "ui/gfx/x/x11_types.h"
|
| #include "ui/views/linux_ui/linux_ui.h"
|
| #include "ui/views/widget/desktop_aura/desktop_screen.h"
|
| @@ -235,7 +236,7 @@ bool DesktopScreenX11::CanDispatchEvent(const ui::PlatformEvent& event) {
|
| event->type - xrandr_event_base_ == RRNotify ||
|
| (event->type == PropertyNotify &&
|
| event->xproperty.window == x_root_window_ &&
|
| - event->xproperty.atom == ui::GetAtom("_NET_WORKAREA"));
|
| + event->xproperty.atom == gfx::GetAtom("_NET_WORKAREA"));
|
| }
|
|
|
| uint32_t DesktopScreenX11::DispatchEvent(const ui::PlatformEvent& event) {
|
| @@ -244,7 +245,7 @@ uint32_t DesktopScreenX11::DispatchEvent(const ui::PlatformEvent& event) {
|
| XRRUpdateConfiguration(event);
|
| } else if (event->type - xrandr_event_base_ == RRNotify ||
|
| (event->type == PropertyNotify &&
|
| - event->xproperty.atom == ui::GetAtom("_NET_WORKAREA"))) {
|
| + event->xproperty.atom == gfx::GetAtom("_NET_WORKAREA"))) {
|
| // There's some sort of observer dispatch going on here, but I don't think
|
| // it's the screen's?
|
| if (configure_timer_.get() && configure_timer_->IsRunning()) {
|
|
|