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

Unified Diff: ui/views/test/x11_property_change_waiter.cc

Issue 2924343002: Move ui::GetAtom to gfx::GetAtom (Closed)
Patch Set: fix CrOs build Created 3 years, 6 months 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
Index: ui/views/test/x11_property_change_waiter.cc
diff --git a/ui/views/test/x11_property_change_waiter.cc b/ui/views/test/x11_property_change_waiter.cc
index b9937b3a117d0d687bba8a52c63fbbffb800ba37..d267b823397fc854efcb0cee1ce8273534bd7d15 100644
--- a/ui/views/test/x11_property_change_waiter.cc
+++ b/ui/views/test/x11_property_change_waiter.cc
@@ -7,10 +7,10 @@
#include <X11/Xlib.h>
#include "base/run_loop.h"
-#include "ui/base/x/x11_util.h"
#include "ui/base/x/x11_window_event_manager.h"
#include "ui/events/platform/platform_event_source.h"
#include "ui/events/platform/scoped_event_dispatcher.h"
+#include "ui/gfx/x/x11_atom_cache.h"
namespace views {
@@ -58,7 +58,7 @@ uint32_t X11PropertyChangeWaiter::DispatchEvent(
const ui::PlatformEvent& event) {
if (!wait_ || event->type != PropertyNotify ||
event->xproperty.window != x_window_ ||
- event->xproperty.atom != ui::GetAtom(property_) ||
+ event->xproperty.atom != gfx::GetAtom(property_) ||
ShouldKeepOnWaiting(event)) {
return ui::POST_DISPATCH_PERFORM_DEFAULT;
}
« no previous file with comments | « ui/views/test/ui_controls_factory_desktop_aurax11.cc ('k') | ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698