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

Side by Side Diff: views/focus/accelerator_handler.h

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 VIEWS_FOCUS_ACCELERATOR_HANDLER_H_ 5 #ifndef VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
6 #define VIEWS_FOCUS_ACCELERATOR_HANDLER_H_ 6 #define VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 #if defined(OS_LINUX) 11 #if defined(OS_LINUX)
12 #include <gdk/gdk.h> 12 #include <gdk/gdk.h>
13 #endif 13 #endif
14 14
15 #include <set> 15 #include <set>
16 #include <vector> 16 #include <vector>
17 17
18 #include "base/message_loop.h" 18 #include "base/message_loop.h"
19 #include "views/views_export.h" 19 #include "views/views_export.h"
20 20
21 namespace views { 21 namespace views {
22 22
23 #if defined(TOUCH_UI) && !defined(USE_WAYLAND) 23 #if (defined(TOUCH_UI) && !defined(USE_WAYLAND)) \
24 || (!defined(WIN_OS) && defined(USE_AURA))
24 // Dispatch an XEvent to the RootView. Return true if the event was dispatched 25 // Dispatch an XEvent to the RootView. Return true if the event was dispatched
25 // and handled, false otherwise. 26 // and handled, false otherwise.
26 bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent); 27 bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent);
27 28
28 // Keep a list of touch devices so that it is possible to determine if a pointer 29 // Keep a list of touch devices so that it is possible to determine if a pointer
29 // event is a touch-event or a mouse-event. 30 // event is a touch-event or a mouse-event.
30 void VIEWS_EXPORT SetTouchDeviceList(std::vector<unsigned int>& devices); 31 void VIEWS_EXPORT SetTouchDeviceList(std::vector<unsigned int>& devices);
31 #endif // TOUCH_UI 32 #endif // TOUCH_UI
32 33
33 // This class delegates the key messages to the associated FocusManager class 34 // This class delegates the key messages to the associated FocusManager class
(...skipping 20 matching lines...) Expand all
54 // The keys currently pressed and consumed by the FocusManager. 55 // The keys currently pressed and consumed by the FocusManager.
55 std::set<WPARAM> pressed_keys_; 56 std::set<WPARAM> pressed_keys_;
56 #endif 57 #endif
57 58
58 DISALLOW_COPY_AND_ASSIGN(AcceleratorHandler); 59 DISALLOW_COPY_AND_ASSIGN(AcceleratorHandler);
59 }; 60 };
60 61
61 } // namespace views 62 } // namespace views
62 63
63 #endif // VIEWS_FOCUS_ACCELERATOR_HANDLER_H_ 64 #endif // VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698