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

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

Issue 5110011: A non-GTK version of menus for touchui. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix compile for touch on chromeos Created 10 years 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 | « views/controls/menu/nested_dispatcher_gtk.cc ('k') | views/focus/accelerator_handler_touch.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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
(...skipping 25 matching lines...) Expand all
36 class AcceleratorHandler : public MessageLoopForUI::Dispatcher { 36 class AcceleratorHandler : public MessageLoopForUI::Dispatcher {
37 public: 37 public:
38 AcceleratorHandler(); 38 AcceleratorHandler();
39 // Dispatcher method. This returns true if an accelerator was processed by the 39 // Dispatcher method. This returns true if an accelerator was processed by the
40 // focus manager 40 // focus manager
41 #if defined(OS_WIN) 41 #if defined(OS_WIN)
42 virtual bool Dispatch(const MSG& msg); 42 virtual bool Dispatch(const MSG& msg);
43 #else 43 #else
44 virtual bool Dispatch(GdkEvent* event); 44 virtual bool Dispatch(GdkEvent* event);
45 #if defined(TOUCH_UI) 45 #if defined(TOUCH_UI)
46 virtual bool Dispatch(XEvent* xev); 46 virtual MessagePumpGlibXDispatcher::DispatchStatus Dispatch(XEvent* xev);
47 #endif 47 #endif
48 #endif 48 #endif
49 49
50 private: 50 private:
51 #if defined(OS_WIN) 51 #if defined(OS_WIN)
52 // The keys currently pressed and consumed by the FocusManager. 52 // The keys currently pressed and consumed by the FocusManager.
53 std::set<WPARAM> pressed_keys_; 53 std::set<WPARAM> pressed_keys_;
54 #endif 54 #endif
55 55
56 DISALLOW_COPY_AND_ASSIGN(AcceleratorHandler); 56 DISALLOW_COPY_AND_ASSIGN(AcceleratorHandler);
57 }; 57 };
58 58
59 } // namespace views 59 } // namespace views
60 60
61 #endif // VIEWS_FOCUS_ACCELERATOR_HANDLER_H_ 61 #endif // VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
OLDNEW
« no previous file with comments | « views/controls/menu/nested_dispatcher_gtk.cc ('k') | views/focus/accelerator_handler_touch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698