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

Unified Diff: ui/base/x/device_list_cache_x.cc

Issue 24482004: events: Make platform specific events code into ui/events/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 3 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/base/x/device_list_cache_x.h ('k') | ui/base/x/events_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/x/device_list_cache_x.cc
diff --git a/ui/base/x/device_list_cache_x.cc b/ui/base/x/device_list_cache_x.cc
deleted file mode 100644
index 9fcb9db940b6159dea9548424dcd53f6b974a1bb..0000000000000000000000000000000000000000
--- a/ui/base/x/device_list_cache_x.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/base/x/device_list_cache_x.h"
-
-#include <algorithm>
-
-#include "base/memory/singleton.h"
-#include "ui/base/x/x11_util.h"
-
-namespace ui {
-
-DeviceListCacheX::DeviceListCacheX() {
-}
-
-DeviceListCacheX::~DeviceListCacheX() {
- std::map<Display*, XDeviceList>::iterator xp;
- for (xp = x_dev_list_map_.begin(); xp != x_dev_list_map_.end(); xp++)
- XFreeDeviceList(xp->second.devices);
- std::map<Display*, XIDeviceList>::iterator xip;
- for (xip = xi_dev_list_map_.begin(); xip != xi_dev_list_map_.end(); xip++)
- XIFreeDeviceInfo(xip->second.devices);
-}
-
-DeviceListCacheX* DeviceListCacheX::GetInstance() {
- return Singleton<DeviceListCacheX>::get();
-}
-
-void DeviceListCacheX::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);
- new_x_dev_list.devices = XListInputDevices(display, &new_x_dev_list.count);
-
- XIDeviceList& new_xi_dev_list = xi_dev_list_map_[display];
- if (new_xi_dev_list.devices)
- XIFreeDeviceInfo(new_xi_dev_list.devices);
- new_xi_dev_list.devices = XIQueryDevice(display, XIAllDevices,
- &new_xi_dev_list.count);
-}
-
-const XDeviceList& DeviceListCacheX::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)
- x_dev_list.devices = XListInputDevices(display, &x_dev_list.count);
- return x_dev_list;
-}
-
-const XIDeviceList& DeviceListCacheX::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,
- &xi_dev_list.count);
- }
- return xi_dev_list;
-}
-
-} // namespace ui
-
« no previous file with comments | « ui/base/x/device_list_cache_x.h ('k') | ui/base/x/events_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698