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

Side by Side Diff: ui/base/x/valuators.cc

Issue 10795024: ui: Forward declare DefaultSingletonTraits in header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/x/valuators.h" 5 #include "ui/base/x/valuators.h"
6 6
7 #include <X11/extensions/XInput2.h> 7 #include <X11/extensions/XInput2.h>
8 8
9 #include "base/memory/singleton.h"
10 #include "ui/base/touch/touch_factory.h"
9 #include "ui/base/x/x11_util.h" 11 #include "ui/base/x/x11_util.h"
10 #include "ui/base/touch/touch_factory.h"
11 12
12 namespace { 13 namespace {
13 14
14 #define AXIS_LABEL_ABS_MT_TOUCH_MAJOR "Abs MT Touch Major" 15 #define AXIS_LABEL_ABS_MT_TOUCH_MAJOR "Abs MT Touch Major"
15 #define AXIS_LABEL_ABS_MT_TOUCH_MINOR "Abs MT Touch Minor" 16 #define AXIS_LABEL_ABS_MT_TOUCH_MINOR "Abs MT Touch Minor"
16 #define AXIS_LABEL_ABS_MT_ORIENTATION "Abs MT Orientation" 17 #define AXIS_LABEL_ABS_MT_ORIENTATION "Abs MT Orientation"
17 #define AXIS_LABEL_ABS_MT_PRESSURE "Abs MT Pressure" 18 #define AXIS_LABEL_ABS_MT_PRESSURE "Abs MT Pressure"
18 #define AXIS_LABEL_ABS_MT_SLOT_ID "Abs MT Slot ID" 19 #define AXIS_LABEL_ABS_MT_SLOT_ID "Abs MT Slot ID"
19 #define AXIS_LABEL_ABS_MT_TRACKING_ID "Abs MT Tracking ID" 20 #define AXIS_LABEL_ABS_MT_TRACKING_ID "Abs MT Tracking ID"
20 21
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 valuator_max_[info->deviceid][j] = valuator->max; 174 valuator_max_[info->deviceid][j] = valuator->max;
174 } 175 }
175 } 176 }
176 } 177 }
177 178
178 if (info_list) 179 if (info_list)
179 XIFreeDeviceInfo(info_list); 180 XIFreeDeviceInfo(info_list);
180 } 181 }
181 182
182 } // namespace ui 183 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698