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

Unified Diff: ui/events/devices/x11/device_data_manager_x11.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
« no previous file with comments | « ui/display/util/x11/edid_parser_x11.cc ('k') | ui/events/platform/x11/x11_event_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/devices/x11/device_data_manager_x11.cc
diff --git a/ui/events/devices/x11/device_data_manager_x11.cc b/ui/events/devices/x11/device_data_manager_x11.cc
index abc70fce85448f4df5e8f55ddcf5bec7f1444ce0..f2182752b365c90cd806ab61180ff9b0457a13a9 100644
--- a/ui/events/devices/x11/device_data_manager_x11.cc
+++ b/ui/events/devices/x11/device_data_manager_x11.cc
@@ -243,7 +243,7 @@ void DeviceDataManagerX11::UpdateDeviceList(Display* display) {
// Find all the touchpad devices.
const XDeviceList& dev_list =
ui::DeviceListCacheX11::GetInstance()->GetXDeviceList(display);
- Atom xi_touchpad = ui::X11AtomCache::GetInstance()->GetAtom(XI_TOUCHPAD);
+ Atom xi_touchpad = gfx::GetAtom(XI_TOUCHPAD);
for (int i = 0; i < dev_list.count; ++i)
if (dev_list[i].type == xi_touchpad)
touchpads_[dev_list[i].id] = true;
@@ -256,8 +256,7 @@ void DeviceDataManagerX11::UpdateDeviceList(Display* display) {
ui::DeviceListCacheX11::GetInstance()->GetXI2DeviceList(display);
Atom atoms[DT_LAST_ENTRY];
for (int data_type = 0; data_type < DT_LAST_ENTRY; ++data_type)
- atoms[data_type] =
- ui::X11AtomCache::GetInstance()->GetAtom(kCachedAtoms[data_type]);
+ atoms[data_type] = gfx::GetAtom(kCachedAtoms[data_type]);
for (int i = 0; i < info_list.count; ++i) {
const XIDeviceInfo& info = info_list[i];
« no previous file with comments | « ui/display/util/x11/edid_parser_x11.cc ('k') | ui/events/platform/x11/x11_event_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698