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

Side by Side Diff: ui/base/touch/touch_factory_x11.h

Issue 16667019: Rename base/hash_tables to base/containers/hash_tables. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/events/key_identifier_conversion.cc ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_ 5 #ifndef UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_
6 #define UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_ 6 #define UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_
7 7
8 #include <bitset> 8 #include <bitset>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/hash_tables.h" 12 #include "base/containers/hash_tables.h"
13 #include "base/timer.h" 13 #include "base/timer.h"
14 #include "ui/base/ui_export.h" 14 #include "ui/base/ui_export.h"
15 15
16 template <typename T> struct DefaultSingletonTraits; 16 template <typename T> struct DefaultSingletonTraits;
17 17
18 typedef unsigned long Cursor; 18 typedef unsigned long Cursor;
19 typedef unsigned long Window; 19 typedef unsigned long Window;
20 typedef struct _XDisplay Display; 20 typedef struct _XDisplay Display;
21 typedef union _XEvent XEvent; 21 typedef union _XEvent XEvent;
22 22
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 // A lookup table for slots in use for a touch event. 125 // A lookup table for slots in use for a touch event.
126 std::bitset<kMaxTouchPoints> slots_used_; 126 std::bitset<kMaxTouchPoints> slots_used_;
127 127
128 DISALLOW_COPY_AND_ASSIGN(TouchFactory); 128 DISALLOW_COPY_AND_ASSIGN(TouchFactory);
129 }; 129 };
130 130
131 } // namespace ui 131 } // namespace ui
132 132
133 #endif // UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_ 133 #endif // UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_
OLDNEW
« no previous file with comments | « ui/base/events/key_identifier_conversion.cc ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698