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

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

Issue 16897006: Move message_pump to base/message_loop. (Closed) Base URL: svn://chrome-svn/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/x/device_data_manager.cc ('k') | ui/base/x/selection_requestor.cc » ('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 #include "ui/base/events/event_constants.h" 5 #include "ui/base/events/event_constants.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <X11/extensions/XInput.h> 8 #include <X11/extensions/XInput.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
15 #include "base/message_pump_aurax11.h" 15 #include "base/message_loop/message_pump_aurax11.h"
16 #include "ui/base/events/event_utils.h" 16 #include "ui/base/events/event_utils.h"
17 #include "ui/base/keycodes/keyboard_code_conversion_x.h" 17 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
18 #include "ui/base/touch/touch_factory_x11.h" 18 #include "ui/base/touch/touch_factory_x11.h"
19 #include "ui/base/x/device_data_manager.h" 19 #include "ui/base/x/device_data_manager.h"
20 #include "ui/base/x/device_list_cache_x.h" 20 #include "ui/base/x/device_list_cache_x.h"
21 #include "ui/base/x/x11_atom_cache.h" 21 #include "ui/base/x/x11_atom_cache.h"
22 #include "ui/base/x/x11_util.h" 22 #include "ui/base/x/x11_util.h"
23 #include "ui/gfx/display.h" 23 #include "ui/gfx/display.h"
24 #include "ui/gfx/point.h" 24 #include "ui/gfx/point.h"
25 #include "ui/gfx/rect.h" 25 #include "ui/gfx/rect.h"
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 noop->xclient.format = 8; 773 noop->xclient.format = 8;
774 DCHECK(!noop->xclient.display); 774 DCHECK(!noop->xclient.display);
775 } 775 }
776 // Make sure we use atom from current xdisplay, which may 776 // Make sure we use atom from current xdisplay, which may
777 // change during the test. 777 // change during the test.
778 noop->xclient.message_type = GetNoopEventAtom(); 778 noop->xclient.message_type = GetNoopEventAtom();
779 return noop; 779 return noop;
780 } 780 }
781 781
782 } // namespace ui 782 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/x/device_data_manager.cc ('k') | ui/base/x/selection_requestor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698