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

Unified Diff: ui/events/devices/x11/device_list_cache_x11.cc

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: fix ozone Created 6 years, 1 month 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/events/devices/x11/device_list_cache_x11.h ('k') | ui/events/devices/x11/touch_factory_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/devices/x11/device_list_cache_x11.cc
diff --git a/ui/events/x/device_list_cache_x.cc b/ui/events/devices/x11/device_list_cache_x11.cc
similarity index 78%
rename from ui/events/x/device_list_cache_x.cc
rename to ui/events/devices/x11/device_list_cache_x11.cc
index df930d11780eed2743aa3924e4d64f6caa5a0e72..7952dd7339cdc84f471307d1fe48241bb4346dcb 100644
--- a/ui/events/x/device_list_cache_x.cc
+++ b/ui/events/devices/x11/device_list_cache_x11.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/events/x/device_list_cache_x.h"
+#include "ui/events/devices/x11/device_list_cache_x11.h"
#include <algorithm>
#include "base/memory/singleton.h"
#include "base/message_loop/message_loop.h"
-#include "ui/events/x/device_data_manager_x11.h"
+#include "ui/events/devices/x11/device_data_manager_x11.h"
namespace {
@@ -24,10 +24,10 @@ bool IsXI2Available() {
namespace ui {
-DeviceListCacheX::DeviceListCacheX() {
+DeviceListCacheX11::DeviceListCacheX11() {
}
-DeviceListCacheX::~DeviceListCacheX() {
+DeviceListCacheX11::~DeviceListCacheX11() {
std::map<Display*, XDeviceList>::iterator xp;
for (xp = x_dev_list_map_.begin(); xp != x_dev_list_map_.end(); xp++) {
if (xp->second.devices)
@@ -40,11 +40,11 @@ DeviceListCacheX::~DeviceListCacheX() {
}
}
-DeviceListCacheX* DeviceListCacheX::GetInstance() {
- return Singleton<DeviceListCacheX>::get();
+DeviceListCacheX11* DeviceListCacheX11::GetInstance() {
+ return Singleton<DeviceListCacheX11>::get();
}
-void DeviceListCacheX::UpdateDeviceList(Display* display) {
+void DeviceListCacheX11::UpdateDeviceList(Display* display) {
XDeviceList& new_x_dev_list = x_dev_list_map_[display];
if (new_x_dev_list.devices)
XFreeDeviceList(new_x_dev_list.devices);
@@ -57,7 +57,7 @@ void DeviceListCacheX::UpdateDeviceList(Display* display) {
XIQueryDevice(display, XIAllDevices, &new_xi_dev_list.count) : NULL;
}
-const XDeviceList& DeviceListCacheX::GetXDeviceList(Display* display) {
+const XDeviceList& DeviceListCacheX11::GetXDeviceList(Display* display) {
XDeviceList& x_dev_list = x_dev_list_map_[display];
// Note that the function can be called before any update has taken place.
if (!x_dev_list.devices && !x_dev_list.count)
@@ -65,7 +65,7 @@ const XDeviceList& DeviceListCacheX::GetXDeviceList(Display* display) {
return x_dev_list;
}
-const XIDeviceList& DeviceListCacheX::GetXI2DeviceList(Display* display) {
+const XIDeviceList& DeviceListCacheX11::GetXI2DeviceList(Display* display) {
XIDeviceList& xi_dev_list = xi_dev_list_map_[display];
if (!xi_dev_list.devices && !xi_dev_list.count) {
xi_dev_list.devices = XIQueryDevice(display, XIAllDevices,
« no previous file with comments | « ui/events/devices/x11/device_list_cache_x11.h ('k') | ui/events/devices/x11/touch_factory_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698